Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OSX/buildsystem: prepare usage on OSX 10.10 - Yosemite

Browse Source 
- important: requires cmake >= 2.8.12 to read minor version right,
aka older cmake rates 10.10 lower than 10.6 for example ! ( sigh )
This commit is contained in:
Jens Verwiebe
2014-08-03 12:51:26 +02:00
parent 47e7ce696c
commit 02b66f8a55
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -322,7 +322,9 @@ if(APPLE)
endif() endif()
execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version 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) set(OSX_SYSTEM 10.9)
elseif(${MAC_SYS} MATCHES 12) elseif(${MAC_SYS} MATCHES 12)
set(OSX_SYSTEM 10.8) set(OSX_SYSTEM 10.8)

5
SConstruct
View File

@@ -323,7 +323,10 @@ if env['OURPLATFORM']=='darwin':
print B.bc.OKGREEN + "Available SDK's: \n" + B.bc.ENDC + MACOSX_SDK_CHECK.replace('\t', '') 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 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_DEPLOYMENT_TARGET'] = '10.6'
env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.9.sdk' env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.9.sdk'
elif 'OS X 10.8' in MACOSX_SDK_CHECK: elif 'OS X 10.8' in MACOSX_SDK_CHECK: