From 7ad66f8ebdd0642a2d9aa27d95f0cd494d60ebfe Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 5 Dec 2016 14:04:22 +0100 Subject: [PATCH] Fixed: Target OS X 10.7 so we can switch to libc++ instead of very old GCC 4.2.1 STL --- code/CMakeModules/nel.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index c7891917c..f44f146d6 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -831,10 +831,17 @@ MACRO(NL_SETUP_BUILD) ELSE() # Always force -mmacosx-version-min to override environement variable IF(CMAKE_OSX_DEPLOYMENT_TARGET) + IF(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.7") + MESSAGE(FATAL_ERROR "Minimum target for OS X is 10.7 but you're using ${CMAKE_OSX_DEPLOYMENT_TARGET}") + ENDIF() SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-macosx_version_min,${CMAKE_OSX_DEPLOYMENT_TARGET}") ENDIF() ENDIF() + # use libc++ under OX X to be able to use new C++ features (and else it'll use GCC 4.2.1 STL) + # minimum target is now OS X 10.7 + ADD_PLATFORM_FLAGS("-stdlib=libc++") + SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-headerpad_max_install_names") IF(HAVE_FLAG_SEARCH_PATHS_FIRST)