diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-03-12 16:03:52 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-03-12 16:03:52 +0400 |
| commit | cd2d2f2f4e6121ba862bf033f79d0bd000c3acea (patch) | |
| tree | d1ed8d58dbb10acca1e6206f1480ac42b0c8a2e7 /CMakeLists.txt | |
| parent | b53cbb4e011f7912f7ef5dcada86e77d55b76766 (diff) | |
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
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 384a39c107f..8a13851b8d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,10 +262,8 @@ if(APPLE) 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 @@ elseif(APPLE) 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() |