CMake and scons update to detect OS X 10.9, cmake patch by Jake Kauth.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 040e393867b56e6c3d22fe0851adce63b9725f5d..e0d7b81cc0cb7caf5cd2a164cab3eecc79322177 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,7 +306,9 @@ if(APPLE)
        endif()
        
        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)
        elseif(${MAC_SYS} MATCHES 11)
                set(OSX_SYSTEM 10.7)

diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py
index 60f8b5705ac3f90054537409419d8451a37495d7..ad0fbcc78da64837bb3899797af4618d38cf1c46 100644 (file)
--- a/build_files/buildbot/config/user-config-mac-i386.py
+++ b/build_files/buildbot/config/user-config-mac-i386.py
@@ -34,6 +34,8 @@ elif cmd_res[:2]=='11':
     MAC_CUR_VER='10.7'
 elif cmd_res[:2]=='12':
     MAC_CUR_VER='10.8'
+elif cmd_res[:2]=='13':
+    MAC_CUR_VER='10.9'
 cmd = 'xcodebuild -version'
 cmd_xcode=commands.getoutput(cmd)
 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
 #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++']
 else:
     LLIBS = ['stdc++', 'SystemStubs']

diff --git a/build_files/buildbot/config/user-config-mac-x86_64.py b/build_files/buildbot/config/user-config-mac-x86_64.py
index 4fab8d6d5666fc5b29851920b57492f9417b7369..fb0a084cf4dec6da47318e4a0ef6cfff12ee752f 100644 (file)
--- a/build_files/buildbot/config/user-config-mac-x86_64.py
+++ b/build_files/buildbot/config/user-config-mac-x86_64.py
@@ -34,6 +34,8 @@ elif cmd_res[:2]=='11':
     MAC_CUR_VER='10.7'
 elif cmd_res[:2]=='12':
     MAC_CUR_VER='10.8'
+elif cmd_res[:2]=='13':
+    MAC_CUR_VER='10.9'
 cmd = 'xcodebuild -version'
 cmd_xcode=commands.getoutput(cmd)
 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
 #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++']
 else:
     LLIBS = ['stdc++', 'SystemStubs']

diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py
index f7192e3dd8151922ee01d011543f09dcdc61c311..57ff3c827f7eb22fdf4ccbeaf0d56b5fea446e4e 100644 (file)
--- a/build_files/scons/config/darwin-config.py
+++ b/build_files/scons/config/darwin-config.py
@@ -34,6 +34,8 @@ elif cmd_res[:2]=='11':
     MAC_CUR_VER='10.7'
 elif cmd_res[:2]=='12':
     MAC_CUR_VER='10.8'
+elif cmd_res[:2]=='13':
+    MAC_CUR_VER='10.9'
 cmd = 'xcodebuild -version'
 cmd_xcode=commands.getoutput(cmd)
 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
 #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++']
 else:
     LLIBS = ['stdc++', 'SystemStubs']