summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-28 12:24:27 (GMT)
committerBrad King <brad.king@kitware.com>2015-10-28 14:15:39 (GMT)
commit63e2af0f8dbae222ebaae62b532340f3d83cbc93 (patch)
tree8ddbc7a6b1cbf378a418e54e62b06a45b092c120 /Modules
parent8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b (diff)
downloadCMake-63e2af0f8dbae222ebaae62b532340f3d83cbc93.zip
CMake-63e2af0f8dbae222ebaae62b532340f3d83cbc93.tar.gz
CMake-63e2af0f8dbae222ebaae62b532340f3d83cbc93.tar.bz2
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.
Diffstat (limited to 'Modules')
-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)