[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3890-g78c5005

[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  78c5005c2fca984359387e9332d1e618b10626af (commit)
       via  335a1278eba2d54c0ca7901e6bf6e40eb50743b6 (commit)
      from  d67a550dbe04d29aade5d5ecf4d92bd5ab91e6c7 (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=78c5005c2fca984359387e9332d1e618b10626af
commit 78c5005c2fca984359387e9332d1e618b10626af
Merge: d67a550 335a127
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 14 19:22:41 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 14 19:22:41 2013 -0400

    Merge topic 'osx-sysroot-default' into next
    
    335a127 OS X: Do not default to non-existent deployment target SDK


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=335a1278eba2d54c0ca7901e6bf6e40eb50743b6
commit 335a1278eba2d54c0ca7901e6bf6e40eb50743b6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 14 19:16:42 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 14 19:16:42 2013 -0400

    OS X: Do not default to non-existent deployment target SDK
    
    Since commit 95f78e08 (OS X: Search for SDK based on deployment target,
    2013-08-02) we select the default OS X SDK path to match the deployment
    target.  Fix this behavior in the case that the matching SDK does not
    exist and fall back to the SDK for the current host OS X version.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index db8c7ef..0930880 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -134,11 +134,23 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
     set(_CMAKE_OSX_SDKS_VER_SUFFIX_10.3 ".9")
     if(CMAKE_OSX_DEPLOYMENT_TARGET)
       set(_CMAKE_OSX_SDKS_VER ${CMAKE_OSX_DEPLOYMENT_TARGET}${_CMAKE_OSX_SDKS_VER_SUFFIX_${CMAKE_OSX_DEPLOYMENT_TARGET}})
+      set(_CMAKE_OSX_SYSROOT_CHECK "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
+      if(IS_DIRECTORY "${_CMAKE_OSX_SYSROOT_CHECK}")
+        set(_CMAKE_OSX_SYSROOT_DEFAULT "${_CMAKE_OSX_SYSROOT_CHECK}")
+      else()
+        set(_CMAKE_OSX_SDKS_VER ${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}})
+        set(_CMAKE_OSX_SYSROOT_DEFAULT "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
+        message(WARNING
+          "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
+          "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n"
+          "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"\n"
+          "matching the host OS X version."
+          )
+      endif()
     else()
       set(_CMAKE_OSX_SDKS_VER ${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}})
+      set(_CMAKE_OSX_SYSROOT_DEFAULT "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
     endif()
-    set(_CMAKE_OSX_SYSROOT_DEFAULT
-      "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
   else()
     # Assume developer files are in root (such as Xcode 4.5 command-line tools).
     set(_CMAKE_OSX_SYSROOT_DEFAULT "")

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

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


hooks/post-receive
-- 
CMake