diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-04 12:53:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-11-04 12:53:25 (GMT) |
| commit | f3698f7c4a19470eb2152ce5acfbce564cc6d4f5 (patch) | |
| tree | 5475fa9bd7bbb976d65ab72ca82865e7c9eac291 /Modules | |
| parent | e405380d06052ca7e86ab9ca297f3e89fe866932 (diff) | |
| parent | 53d6ebb36079bd30c9033e4374fd8d31a2928b6a (diff) | |
| download | CMake-f3698f7c4a19470eb2152ce5acfbce564cc6d4f5.zip CMake-f3698f7c4a19470eb2152ce5acfbce564cc6d4f5.tar.gz CMake-f3698f7c4a19470eb2152ce5acfbce564cc6d4f5.tar.bz2 | |
Merge topic 'cpack-drag-n-drop-rez'
53d6ebb cpack: For DragNDrop generator, add sysroot option when calling Rez.
193029c cpack: For DragNDrop generator, add sysroot option when calling Rez.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPack.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index da6b2e0..2d641f5 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -519,6 +519,11 @@ cpack_set_if_not_set(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "") # WiX specific variables cpack_set_if_not_set(CPACK_WIX_SIZEOF_VOID_P "${CMAKE_SIZEOF_VOID_P}") +# set sysroot so SDK tools can be used +if(CMAKE_OSX_SYSROOT) + cpack_set_if_not_set(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") +endif() + if(DEFINED CPACK_COMPONENTS_ALL) if(CPACK_MONOLITHIC_INSTALL) message("CPack warning: both CPACK_COMPONENTS_ALL and CPACK_MONOLITHIC_INSTALL have been set.\nDefaulting to a monolithic installation.") |