[build] use cmake script bundled with Mason

5 files changed, 25 insertions, 24 deletions

diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index b5924b110e..aa1cec2072 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -1,14 +1,12 @@
 #Include to use build specific variables
 include(${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake)
 
-mason_use(geojson 0.1.4)
-mason_use(jni.hpp 2.0.0)
-mason_use(libjpeg-turbo 1.4.2)
-mason_use(libpng 1.6.20)
-mason_use(libzip 0.11.2)
-mason_use(nunicode 1.6)
-mason_use(sqlite 3.9.1)
-mason_use(zlib system)
+mason_use(jni.hpp VERSION 2.0.0 HEADER_ONLY)
+mason_use(libjpeg-turbo VERSION 1.4.2)
+mason_use(libpng VERSION 1.6.20)
+mason_use(libzip VERSION 0.11.2)
+mason_use(nunicode VERSION 1.6)
+mason_use(sqlite VERSION 3.9.1)
 
 macro(mbgl_platform_core)
 
@@ -57,7 +55,6 @@ macro(mbgl_platform_core)
     target_add_mason_package(mbgl-core PUBLIC nunicode)
     target_add_mason_package(mbgl-core PUBLIC libpng)
     target_add_mason_package(mbgl-core PUBLIC libjpeg-turbo)
-    target_add_mason_package(mbgl-core PUBLIC zlib)
     target_add_mason_package(mbgl-core PUBLIC libzip)
     target_add_mason_package(mbgl-core PUBLIC geojson)
     target_add_mason_package(mbgl-core PUBLIC jni.hpp)
@@ -69,6 +66,7 @@ macro(mbgl_platform_core)
         PUBLIC -lGLESv2
         PUBLIC -lstdc++
         PUBLIC -latomic
+        PUBLIC -lz
     )
 endmacro()
 
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake
index 814a249849..038719d66f 100644
--- a/platform/linux/config.cmake
+++ b/platform/linux/config.cmake
@@ -1,11 +1,12 @@
-mason_use(glfw 3.1.2)
-mason_use(boost_libprogram_options 1.60.0)
-mason_use(sqlite 3.9.1)
-mason_use(libuv 1.7.5)
-mason_use(nunicode 1.6)
-mason_use(libpng 1.6.20)
-mason_use(libjpeg-turbo 1.4.2)
-mason_use(webp 0.5.0)
+mason_use(glfw VERSION 3.1.2)
+mason_use(boost_libprogram_options VERSION 1.60.0)
+mason_use(sqlite VERSION 3.9.1)
+mason_use(libuv VERSION 1.7.5)
+mason_use(nunicode VERSION 1.6)
+mason_use(libpng VERSION 1.6.20)
+mason_use(libjpeg-turbo VERSION 1.4.2)
+mason_use(webp VERSION 0.5.0)
+mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
 
 include(cmake/loop-uv.cmake)
 
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake
index fcb2c9a3e3..b9f18635c1 100644
--- a/platform/macos/config.cmake
+++ b/platform/macos/config.cmake
@@ -1,5 +1,6 @@
-mason_use(glfw 3.1.2)
-mason_use(boost_libprogram_options 1.60.0)
+mason_use(glfw VERSION 3.1.2)
+mason_use(boost_libprogram_options VERSION 1.60.0)
+mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
 
 include(cmake/loop-darwin.cmake)
 
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake
index 5e3b0bd92a..46cc98eb81 100644
--- a/platform/qt/config.cmake
+++ b/platform/qt/config.cmake
@@ -1,11 +1,12 @@
 include(platform/qt/qt.cmake)
 
-mason_use(sqlite 3.9.1)
+mason_use(sqlite VERSION 3.9.1)
+mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
 
 if(NOT WITH_QT_DECODERS)
-    mason_use(libjpeg-turbo 1.4.2)
-    mason_use(libpng 1.6.20)
-    mason_use(webp 0.5.0)
+    mason_use(libjpeg-turbo VERSION 1.4.2)
+    mason_use(libpng VERSION 1.6.20)
+    mason_use(webp VERSION 0.5.0)
 endif()
 
 macro(mbgl_platform_core)
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake
index 9d8ae10f9e..2d3ec58ad9 100644
--- a/platform/qt/qt.cmake
+++ b/platform/qt/qt.cmake
@@ -82,7 +82,7 @@ else()
 endif()
 
 # OS specific configurations
-if (BUILD_PLATFORM STREQUAL "macos")
+if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
     list(APPEND MBGL_QT_FILES
         PRIVATE platform/darwin/src/nsthread.mm
         PRIVATE platform/darwin/src/headless_view_cgl.cpp