diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-18 16:00:57 +0300 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 4e5fc0d7a4cbb85e9e43f5cac958ef132512c413 (patch) | |
| tree | 8912c03a9e0898ab2e60743d5e660f3363ed66a1 | |
| parent | 692fe1f3ffc8f4364b39c14aa7d90cec2ff5c0a6 (diff) | |
| download | qtlocation-mapboxgl-4e5fc0d7a4cbb85e9e43f5cac958ef132512c413.tar.gz | |
[build] Do not redefine MASON_PLATFORM
| -rw-r--r-- | cmake/mbgl.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index 105c8822e9..a796a9b372 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -6,10 +6,12 @@ if (NOT DEFINED MBGL_PLATFORM) endif() endif() -if(MBGL_PLATFORM STREQUAL "macos") - set(ENV{MASON_PLATFORM} "osx") -else() - set(ENV{MASON_PLATFORM} ${MBGL_PLATFORM}) +if (NOT DEFINED ENV{MASON_PLATFORM}) + if(MBGL_PLATFORM STREQUAL "macos") + set(ENV{MASON_PLATFORM} "osx") + else() + set(ENV{MASON_PLATFORM} ${MBGL_PLATFORM}) + endif() endif() set(MBGL_GENERATED ${CMAKE_BINARY_DIR}/generated/${CMAKE_CFG_INTDIR}) |