From 02b66f8a55096ffa9631cfdcf1f53add12841c7f Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Sun, 3 Aug 2014 12:51:26 +0200 Subject: [PATCH] OSX/buildsystem: prepare usage on OSX 10.10 - Yosemite - important: requires cmake >= 2.8.12 to read minor version right, aka older cmake rates 10.10 lower than 10.6 for example ! ( sigh ) --- CMakeLists.txt | 4 +++- SConstruct | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ea112bfbe7..ebe5eaee280 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -322,7 +322,9 @@ if(APPLE) endif() execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version - if(${MAC_SYS} MATCHES 13) + if(${MAC_SYS} MATCHES 14) + set(OSX_SYSTEM 10.10) + elseif(${MAC_SYS} MATCHES 13) set(OSX_SYSTEM 10.9) elseif(${MAC_SYS} MATCHES 12) set(OSX_SYSTEM 10.8) diff --git a/SConstruct b/SConstruct index 055409a3dba..7c874fbd55a 100644 --- a/SConstruct +++ b/SConstruct @@ -323,7 +323,10 @@ if env['OURPLATFORM']=='darwin': print B.bc.OKGREEN + "Available SDK's: \n" + B.bc.ENDC + MACOSX_SDK_CHECK.replace('\t', '') if env['MACOSX_SDK'] == '': # no set sdk, choosing best one found - if 'OS X 10.9' in MACOSX_SDK_CHECK: + if 'OS X 10.10' in MACOSX_SDK_CHECK: + env['MACOSX_DEPLOYMENT_TARGET'] = '10.6' + env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.10.sdk' + elif 'OS X 10.9' in MACOSX_SDK_CHECK: env['MACOSX_DEPLOYMENT_TARGET'] = '10.6' env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.9.sdk' elif 'OS X 10.8' in MACOSX_SDK_CHECK: