forked from bartvdbraak/blender
CMake and scons update to detect OS X 10.9, cmake patch by Jake Kauth.
This commit is contained in:
parent
0fd100edd4
commit
f634509dc2
@ -306,7 +306,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 12)
|
if(${MAC_SYS} MATCHES 13)
|
||||||
|
set(OSX_SYSTEM 10.9)
|
||||||
|
elseif(${MAC_SYS} MATCHES 12)
|
||||||
set(OSX_SYSTEM 10.8)
|
set(OSX_SYSTEM 10.8)
|
||||||
elseif(${MAC_SYS} MATCHES 11)
|
elseif(${MAC_SYS} MATCHES 11)
|
||||||
set(OSX_SYSTEM 10.7)
|
set(OSX_SYSTEM 10.7)
|
||||||
|
@ -34,6 +34,8 @@ elif cmd_res[:2]=='11':
|
|||||||
MAC_CUR_VER='10.7'
|
MAC_CUR_VER='10.7'
|
||||||
elif cmd_res[:2]=='12':
|
elif cmd_res[:2]=='12':
|
||||||
MAC_CUR_VER='10.8'
|
MAC_CUR_VER='10.8'
|
||||||
|
elif cmd_res[:2]=='13':
|
||||||
|
MAC_CUR_VER='10.9'
|
||||||
cmd = 'xcodebuild -version'
|
cmd = 'xcodebuild -version'
|
||||||
cmd_xcode=commands.getoutput(cmd)
|
cmd_xcode=commands.getoutput(cmd)
|
||||||
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
|
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
|
||||||
@ -367,7 +369,7 @@ if not WITH_OSX_STATICPYTHON:
|
|||||||
|
|
||||||
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
|
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
|
||||||
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
|
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
|
||||||
if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
|
if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"):
|
||||||
LLIBS = ['stdc++']
|
LLIBS = ['stdc++']
|
||||||
else:
|
else:
|
||||||
LLIBS = ['stdc++', 'SystemStubs']
|
LLIBS = ['stdc++', 'SystemStubs']
|
||||||
|
@ -34,6 +34,8 @@ elif cmd_res[:2]=='11':
|
|||||||
MAC_CUR_VER='10.7'
|
MAC_CUR_VER='10.7'
|
||||||
elif cmd_res[:2]=='12':
|
elif cmd_res[:2]=='12':
|
||||||
MAC_CUR_VER='10.8'
|
MAC_CUR_VER='10.8'
|
||||||
|
elif cmd_res[:2]=='13':
|
||||||
|
MAC_CUR_VER='10.9'
|
||||||
cmd = 'xcodebuild -version'
|
cmd = 'xcodebuild -version'
|
||||||
cmd_xcode=commands.getoutput(cmd)
|
cmd_xcode=commands.getoutput(cmd)
|
||||||
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
|
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
|
||||||
@ -367,7 +369,7 @@ if not WITH_OSX_STATICPYTHON:
|
|||||||
|
|
||||||
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
|
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
|
||||||
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
|
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
|
||||||
if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
|
if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"):
|
||||||
LLIBS = ['stdc++']
|
LLIBS = ['stdc++']
|
||||||
else:
|
else:
|
||||||
LLIBS = ['stdc++', 'SystemStubs']
|
LLIBS = ['stdc++', 'SystemStubs']
|
||||||
|
@ -34,6 +34,8 @@ elif cmd_res[:2]=='11':
|
|||||||
MAC_CUR_VER='10.7'
|
MAC_CUR_VER='10.7'
|
||||||
elif cmd_res[:2]=='12':
|
elif cmd_res[:2]=='12':
|
||||||
MAC_CUR_VER='10.8'
|
MAC_CUR_VER='10.8'
|
||||||
|
elif cmd_res[:2]=='13':
|
||||||
|
MAC_CUR_VER='10.9'
|
||||||
cmd = 'xcodebuild -version'
|
cmd = 'xcodebuild -version'
|
||||||
cmd_xcode=commands.getoutput(cmd)
|
cmd_xcode=commands.getoutput(cmd)
|
||||||
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
|
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
|
||||||
@ -367,7 +369,7 @@ if not WITH_OSX_STATICPYTHON:
|
|||||||
|
|
||||||
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
|
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
|
||||||
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
|
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
|
||||||
if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
|
if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"):
|
||||||
LLIBS = ['stdc++']
|
LLIBS = ['stdc++']
|
||||||
else:
|
else:
|
||||||
LLIBS = ['stdc++', 'SystemStubs']
|
LLIBS = ['stdc++', 'SystemStubs']
|
||||||
|
Loading…
Reference in New Issue
Block a user