[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59879] trunk/blender: CMake and scons update to detect OS X 10.9, cmake patch by Jake Kauth.

[Brecht Van Lommel]

Revision: 59879
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59879
Author:   blendix
Date:     2013-09-06 12:43:27 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
CMake and scons update to detect OS X 10.9, cmake patch by Jake Kauth.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
    trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py
    trunk/blender/build_files/scons/config/darwin-config.py

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-09-06 12:11:15 UTC (rev 59878)
+++ trunk/blender/CMakeLists.txt	2013-09-06 12:43:27 UTC (rev 59879)
@@ -306,7 +306,9 @@
 	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)

Modified: trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-mac-i386.py	2013-09-06 12:11:15 UTC (rev 59878)
+++ trunk/blender/build_files/buildbot/config/user-config-mac-i386.py	2013-09-06 12:43:27 UTC (rev 59879)
@@ -34,6 +34,8 @@
     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 @@
 
 #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']

Modified: trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py	2013-09-06 12:11:15 UTC (rev 59878)
+++ trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py	2013-09-06 12:43:27 UTC (rev 59879)
@@ -34,6 +34,8 @@
     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 @@
 
 #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']

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2013-09-06 12:11:15 UTC (rev 59878)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2013-09-06 12:43:27 UTC (rev 59879)
@@ -34,6 +34,8 @@
     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 @@
 
 #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']