summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-29 12:42:30 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-10-29 12:42:30 (GMT)
commit5cdba31fc631453d530abbac04bf4a455d1f10bb (patch)
treec88b00de891df6e0923721854c1671d2d1b0acce
parent7f6c613fd041e8b2dcbfdfc43992a6db28a4b36a (diff)
parent63e2af0f8dbae222ebaae62b532340f3d83cbc93 (diff)
downloadCMake-5cdba31fc631453d530abbac04bf4a455d1f10bb.zip
CMake-5cdba31fc631453d530abbac04bf4a455d1f10bb.tar.gz
CMake-5cdba31fc631453d530abbac04bf4a455d1f10bb.tar.bz2
Merge topic 'cpack-osx-sysroot'
63e2af0f CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)
-rw-r--r--Modules/CPack.cmake2
1 files changed, 1 insertions, 1 deletions
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)