[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3621-g7e31e51

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7e31e51eea43afd13acced2bc5dc49d54c0fb302 (commit)
       via  95f78e08febc541ec9f1d1b57e57c1c639c2d50a (commit)
      from  d877f07415c4d17d69186671cfe930ac2f149056 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e31e51eea43afd13acced2bc5dc49d54c0fb302
commit 7e31e51eea43afd13acced2bc5dc49d54c0fb302
Merge: d877f07 95f78e0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 2 14:38:53 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 2 14:38:53 2013 -0400

    Merge topic 'osx-find-sdk-for-deployment-target' into next
    
    95f78e0 OS X: Search for SDK based on deployment target (#14324)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95f78e08febc541ec9f1d1b57e57c1c639c2d50a
commit 95f78e08febc541ec9f1d1b57e57c1c639c2d50a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 2 14:00:13 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 2 14:05:00 2013 -0400

    OS X: Search for SDK based on deployment target (#14324)
    
    When available, use CMAKE_OSX_DEPLOYMENT_TARGET instead of the host OS X
    version to select the default SDK.  This makes sense because one should
    use the SDK matching the deployment target.
    
    Suggested-by: John Ralls <jralls at ceridwen.us>

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index f0652b9..865cc8e 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -132,7 +132,11 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
     # specially named SDKs.
     set(_CMAKE_OSX_SDKS_VER_SUFFIX_10.4 "u")
     set(_CMAKE_OSX_SDKS_VER_SUFFIX_10.3 ".9")
-    set(_CMAKE_OSX_SDKS_VER ${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}})
+    if(CMAKE_OSX_DEPLOYMENT_TARGET)
+      set(_CMAKE_OSX_SDKS_VER ${CMAKE_OSX_DEPLOYMENT_TARGET}${_CMAKE_OSX_SDKS_VER_SUFFIX_${CMAKE_OSX_DEPLOYMENT_TARGET}})
+    else()
+      set(_CMAKE_OSX_SDKS_VER ${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}})
+    endif()
     set(_CMAKE_OSX_SYSROOT_DEFAULT
       "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
   else()

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Darwin.cmake |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake