[Cmake-commits] CMake branch, next, updated. v3.0.0-4520-gf8d67f9

[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  f8d67f90f0a88a368d154cc1e6bbe6566d9f7dc4 (commit)
       via  5b4faeefe36fd775fd60f98aedf0cc35202f99f4 (commit)
       via  a971de3adf5f89cbbc37c492f1a53d1790d23729 (commit)
       via  a31b42a46fe16376607fdda1cec160b7e860063a (commit)
       via  06a190b10a16f8504b546f21f1295696aac794d9 (commit)
       via  4d7b9375b0a56a78a6cfa823069cc57e37fe9766 (commit)
      from  a658e61dadbc1619eda8a10da0b7d237eb737036 (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=f8d67f90f0a88a368d154cc1e6bbe6566d9f7dc4
commit f8d67f90f0a88a368d154cc1e6bbe6566d9f7dc4
Merge: a658e61 5b4faee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 10:03:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 28 10:03:51 2014 -0400

    Merge topic 'osx-no-sysroot-for-deployment' into next
    
    5b4faeef OS X: Allow deployment target with "/" sysroot (#15040)
    a971de3a CMake Nightly Date Stamp
    a31b42a4 CMake Nightly Date Stamp
    06a190b1 CMake Nightly Date Stamp
    4d7b9375 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b4faeefe36fd775fd60f98aedf0cc35202f99f4
commit 5b4faeefe36fd775fd60f98aedf0cc35202f99f4
Author:     Jeremy Huddleston <jeremyhu at macports.org>
AuthorDate: Sat Jul 19 20:43:20 2014 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 28 09:52:21 2014 -0400

    OS X: Allow deployment target with "/" sysroot (#15040)
    
    Allow the combination
    
     -DCMAKE_OSX_DEPLOYMENT_TARGET="10.8" -DCMAKE_OSX_SYSROOT="/"
    
    to work.  Treat the "/" sysroot as targeting the current OS X version.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index e25df1e..e5c5f36 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -70,6 +70,8 @@ if(CMAKE_OSX_DEPLOYMENT_TARGET)
     set(_sdk_ver "${CMAKE_MATCH_1}")
   elseif("${_CMAKE_OSX_SYSROOT_ORIG}" MATCHES "^macosx([0-9]+\\.[0-9]+)$")
     set(_sdk_ver "${CMAKE_MATCH_1}")
+  elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/")
+    set(_sdk_ver "${_CURRENT_OSX_VERSION}")
   else()
     message(FATAL_ERROR
       "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "

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

Summary of changes:
 Modules/Platform/Darwin.cmake |    2 ++
 Source/CMakeVersion.cmake     |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake