[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44831] trunk/blender/CMakeLists.txt: OSX/ cmake: use again 10.5 as general deployment target ( pls verify 10. 5 compatibility works with automatic weaklinking), use now then sdk which for sure exists, remove obsolete slash

[jens verwiebe]

Revision: 44831
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44831
Author:   jensverwiebe
Date:     2012-03-12 12:03:52 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
OSX/cmake: use again 10.5 as general deployment target ( pls verify 10.5 
compatibility works with automatic weaklinking), use now then sdk which for 
sure exists, remove obsolete slash

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt        2012-03-12 11:32:23 UTC (rev 44830)
+++ trunk/blender/CMakeLists.txt        2012-03-12 12:03:52 UTC (rev 44831)
@@ -262,10 +262,8 @@
        endif()
        message(STATUS "Detected system-version: " ${OSX_SYSTEM})
        
-       if(${OSX_SYSTEM} GREATER 10.6)
-                       set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "" 
FORCE) # 10.7 does not have 10.5sdk !!!
-       else()
-                       set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" 
FORCE) # 10.5 is our minimum target
+       if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+                       set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" 
FORCE) # 10.5 is our minimum target, if you have higher sdk, weak linking 
happens
        endif()
 
        if(${CMAKE_GENERATOR} MATCHES "Xcode")
@@ -1097,12 +1095,12 @@
        endif()
 
        if(${XCODE_VERSION} LESS 4.3)
-               SET(CMAKE_OSX_SYSROOT 
/Developer/SDKs/MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}.sdk CACHE PATH "" FORCE )
+               SET(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk 
CACHE PATH "" FORCE ) # use guaranteed existing sdk
        else()
                # note: i don't use xcode-select path on purpose, cause also 
/Applications/Xcode.app would be allowed
                # absolute pathes are more foolproof here !
                SET(OSX_SYSROOT_PREFIX 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
-               SET(OSX_DEVELOPER_PREFIX 
/Developer/SDKs/MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}.sdk)
+               SET(OSX_DEVELOPER_PREFIX 
/Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
                SET(CMAKE_OSX_SYSROOT 
${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
        endif() 
        

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs