[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1164-g39a3b09

[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  39a3b09a53ea3b8334153b97805ff4cd99593386 (commit)
       via  63e2af0f8dbae222ebaae62b532340f3d83cbc93 (commit)
      from  2986208551bbd84b7dfe8fa28955b334f2faced8 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39a3b09a53ea3b8334153b97805ff4cd99593386
commit 39a3b09a53ea3b8334153b97805ff4cd99593386
Merge: 2986208 63e2af0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 10:16:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 10:16:59 2015 -0400

    Merge topic 'cpack-osx-sysroot' into next
    
    63e2af0f CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63e2af0f8dbae222ebaae62b532340f3d83cbc93
commit 63e2af0f8dbae222ebaae62b532340f3d83cbc93
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:24:27 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 10:15:39 2015 -0400

    CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)
    
    We support setting CMAKE_OSX_SYSROOT to a symbolic value like "macosx".
    Modules/Platform/Darwin-Initialize.cmake takes care of finding the
    actual SDK path on disk.  Use that result to set CPACK_OSX_SYSROOT
    instead.

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 5756001..77f854d 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -586,7 +586,7 @@ _cpack_set_default(CPACK_WIX_SIZEOF_VOID_P "${CMAKE_SIZEOF_VOID_P}")
 
 # set sysroot so SDK tools can be used
 if(CMAKE_OSX_SYSROOT)
-  _cpack_set_default(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
+  _cpack_set_default(CPACK_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_PATH}")
 endif()
 
 if(DEFINED CPACK_COMPONENTS_ALL)

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

Summary of changes:
 Modules/CPack.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake