From 95b6d48b710a38b7969b72b6d2a89f3930fdbc0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Thu, 28 Jul 2016 13:01:43 +0200 Subject: [build] use cmake script bundled with Mason --- cmake/mbgl.cmake | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'cmake/mbgl.cmake') diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index 317057a406..752f05619c 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -1,4 +1,4 @@ -if (NOT DEFINED MBGL_PLATFORM) +if (NOT MBGL_PLATFORM) if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(MBGL_PLATFORM "macos") else() @@ -6,16 +6,8 @@ if (NOT DEFINED MBGL_PLATFORM) endif() endif() -if (NOT DEFINED ENV{MASON_PLATFORM}) - if(MBGL_PLATFORM STREQUAL "qt") - set(ENV{MASON_PLATFORM} ${BUILD_PLATFORM}) - else() - set(ENV{MASON_PLATFORM} ${MBGL_PLATFORM}) - endif() -endif() - -if ("$ENV{MASON_PLATFORM}" STREQUAL "macos") - set(ENV{MASON_PLATFORM} "osx") +if (NOT MASON_PLATFORM) + set(MASON_PLATFORM "${MBGL_PLATFORM}") endif() set(MBGL_GENERATED ${CMAKE_BINARY_DIR}/generated/${CMAKE_CFG_INTDIR}) @@ -54,3 +46,7 @@ endfunction() file(WRITE "${CMAKE_BINARY_DIR}/config.xcconfig" "// Do not edit -- generated by CMake\n") set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10) + +# CMake 3.1 does not have this yet. +set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14") +set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14") -- cgit v1.2.1