diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-05 10:28:05 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-13 11:50:39 -0700 |
commit | ca9ba9cb43f4947fe75b5e6caabaa08fdfe6a278 (patch) | |
tree | 570e11eec9320a0221be4d5235ab6b5f2869ff77 /platform | |
parent | c6e43fa48265279eff506e4b71fadcd080ebb1a4 (diff) | |
download | qtlocation-mapboxgl-ca9ba9cb43f4947fe75b5e6caabaa08fdfe6a278.tar.gz |
[build] Move all mason_use statements to a single file
So its checksum can be used in a CI cache key name.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/config.cmake | 5 | ||||
-rw-r--r-- | platform/ios/config.cmake | 2 | ||||
-rw-r--r-- | platform/linux/config.cmake | 12 | ||||
-rw-r--r-- | platform/macos/config.cmake | 6 | ||||
-rw-r--r-- | platform/qt/config.cmake | 15 |
5 files changed, 0 insertions, 40 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index fa26987e5a..88130dc104 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -21,11 +21,6 @@ endif() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections -Wl,--version-script=${CMAKE_SOURCE_DIR}/platform/android/version-script") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -Wl,--version-script=${CMAKE_SOURCE_DIR}/platform/android/version-script") -mason_use(jni.hpp VERSION 3.0.0 HEADER_ONLY) -mason_use(sqlite VERSION 3.14.2) -mason_use(gtest VERSION 1.8.0) -mason_use(icu VERSION 58.1-min-size) - ## mbgl core ## macro(mbgl_platform_core) diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index a607fbdf35..6dd3f23a69 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -1,7 +1,5 @@ add_definitions(-DMBGL_USE_GLES2=1) -mason_use(icu VERSION 58.1-min-size) - macro(initialize_ios_target target) set_xcode_property(${target} IPHONEOS_DEPLOYMENT_TARGET "9.0") set_xcode_property(${target} ENABLE_BITCODE "YES") diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 08376cbfa3..c1eb4bfe12 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,16 +1,5 @@ include(cmake/nunicode.cmake) -mason_use(glfw VERSION 2018-06-27-0be4f3f) -mason_use(sqlite VERSION 3.14.2) -mason_use(libuv VERSION 1.9.1) -mason_use(libpng VERSION 1.6.25) -mason_use(libjpeg-turbo VERSION 1.5.0) -mason_use(webp VERSION 0.5.1) -mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX}) -mason_use(benchmark VERSION 1.2.0) -mason_use(icu VERSION 58.1-min-size) -mason_use(args VERSION 6.2.0 HEADER_ONLY) - add_library(mbgl-loop-uv STATIC platform/default/async_task.cpp platform/default/run_loop.cpp @@ -40,7 +29,6 @@ macro(mbgl_platform_core) target_sources(mbgl-core PRIVATE platform/linux/src/headless_backend_egl.cpp ) - mason_use(swiftshader VERSION 2017-11-20) target_add_mason_package(mbgl-core PUBLIC swiftshader) else() target_sources(mbgl-core diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index 20ac7bc242..6333beaeb5 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -1,11 +1,5 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11) -mason_use(glfw VERSION 2018-06-27-0be4f3f) -mason_use(gtest VERSION 1.8.0) -mason_use(benchmark VERSION 1.2.0) -mason_use(icu VERSION 58.1-min-size) -mason_use(args VERSION 6.2.0 HEADER_ONLY) - include(cmake/loop-darwin.cmake) macro(mbgl_platform_core) diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 757c0ac44a..785b3cd76a 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -1,19 +1,6 @@ -mason_use(optional VERSION f27e7908 HEADER_ONLY) -mason_use(tao_tuple VERSION 28626e99 HEADER_ONLY) - include(platform/qt/qt.cmake) include(cmake/nunicode.cmake) -if(NOT WITH_QT_DECODERS) - mason_use(libjpeg-turbo VERSION 1.5.0) - mason_use(libpng VERSION 1.6.25) - mason_use(webp VERSION 0.5.1) -endif() - -if(NOT WITH_QT_I18N) - mason_use(icu VERSION 58.1-min-size) -endif() - macro(mbgl_platform_core) target_sources(mbgl-core ${MBGL_QT_CORE_FILES} @@ -76,8 +63,6 @@ endmacro() # FIXME: For now tests are disabled on Windows until we # get the node.js dependencies working. if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX}) - macro(mbgl_platform_test) target_sources(mbgl-test PRIVATE platform/qt/test/main.cpp |