From 4e5fc0d7a4cbb85e9e43f5cac958ef132512c413 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Mon, 18 Jul 2016 16:00:57 +0300 Subject: [build] Do not redefine MASON_PLATFORM --- cmake/mbgl.cmake | 10 ++++++---- 1 file 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}) -- cgit v1.2.1