diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-08-23 12:15:09 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-09-11 11:43:54 +0200 |
| commit | 2fccdecfb1ae720682276c0342e1c3902d8c9873 (patch) | |
| tree | 7de62d938f0691b91681bca1c510a89f07eda067 /cmake | |
| parent | bc9b2249169276987af4ed91b29bf8a2fd65e15e (diff) | |
| download | qtlocation-mapboxgl-2fccdecfb1ae720682276c0342e1c3902d8c9873.tar.gz | |
[build] add script to generate a standalone version of Mapbox GL
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mason-dependencies.cmake | 2 | ||||
| -rw-r--r-- | cmake/mason.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake index a143ec8ee6..3c6a535fc8 100644 --- a/cmake/mason-dependencies.cmake +++ b/cmake/mason-dependencies.cmake @@ -21,7 +21,7 @@ mason_use(vector-tile VERSION 1.0.2 HEADER_ONLY) if(MBGL_PLATFORM STREQUAL "android") mason_use(jni.hpp VERSION 4.0.0 HEADER_ONLY) elseif(MBGL_PLATFORM STREQUAL "ios") - mason_use(icu VERSION 58.1-min-size) + # noop elseif(MBGL_PLATFORM STREQUAL "linux") mason_use(glfw VERSION 2018-06-27-0be4f3f) mason_use(libuv VERSION 1.9.1) diff --git a/cmake/mason.cmake b/cmake/mason.cmake index 76d02b95b5..c0795d962c 100644 --- a/cmake/mason.cmake +++ b/cmake/mason.cmake @@ -208,8 +208,8 @@ endif() mason_detect_platform() -# Execute commands if CMake is run in command mode -if (CMAKE_ARGC) +# Execute commands if CMake is run in command mode\ +if (CMAKE_ARGC AND "${CMAKE_SCRIPT_MODE_FILE}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/mason.cmake") # Collect remaining arguments for passing to mason_use set(_MASON_ARGS) foreach(I RANGE 4 ${CMAKE_ARGC}) |