From 62c0f937db7fdddcca2d157627c48664570912d6 Mon Sep 17 00:00:00 2001 From: KVS85 Date: Wed, 24 Jul 2019 15:42:12 +0300 Subject: [PATCH] Backport of MACOSX_DEPLOYMENT_TARGET from devel (#9554) * Backport of MACOSX_DEPLOYMENT_TARGET from devel * Fix typo --- CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55ed52503f..669006ffbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -568,18 +568,24 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE) endif () if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + # MSVC2018.1 - MSVC2018.7 does not correctly support alignas() if (MSVC_VERSION VERSION_LESS 1915) message(FATAL_ERROR "ArangoDB Requires at least MSVC 2017 update 15.8!") endif() - - # MSVC2018.1 - MSVC2018.7 does not correctly support alignas() + # MSVC2018.8 requires the following define add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE) endif() if (CMAKE_COMPILER_IS_CLANG) if (APPLE) - set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++") + if ($ENV{MACOSX_DEPLOYMENT_TARGET} STREQUAL "") + set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++") + else () + set(BASE_C_FLAGS "${BASE_C_FLAGS} -mmacosx-version-min=$ENV{MACOSX_DEPLOYMENT_TARGET}") + set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++ -mmacosx-version-min=$ENV{MACOSX_DEPLOYMENT_TARGET}") + set(BASE_LD_FLAGS "${BASE_LD_FLAGS} -mmacosx-version-min=$ENV{MACOSX_DEPLOYMENT_TARGET}") + endif () add_definitions("-Wno-deprecated-declarations") else () if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.3")