diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2013-11-01 11:31:07 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2013-11-01 11:31:07 (GMT) |
| commit | 53d6ebb36079bd30c9033e4374fd8d31a2928b6a (patch) | |
| tree | 28b265934aa53539128e88ebfb42469f8bfe79f4 | |
| parent | 193029c4aaad7a13f0b6efed59a1c88af0dc6714 (diff) | |
| download | CMake-53d6ebb36079bd30c9033e4374fd8d31a2928b6a.zip CMake-53d6ebb36079bd30c9033e4374fd8d31a2928b6a.tar.gz CMake-53d6ebb36079bd30c9033e4374fd8d31a2928b6a.tar.bz2 | |
cpack: For DragNDrop generator, add sysroot option when calling Rez.
| -rw-r--r-- | Modules/CPack.cmake | 4 | ||||
| -rw-r--r-- | Source/CPack/cmCPackDragNDropGenerator.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index cd98f49..2d641f5 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -519,9 +519,9 @@ 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}") -# osx sysroot +# set sysroot so SDK tools can be used if(CMAKE_OSX_SYSROOT) - set(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") + cpack_set_if_not_set(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") endif() if(DEFINED CPACK_COMPONENTS_ALL) diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index ab386d3..dfb2f15 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -505,7 +505,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, cmOStringStream embed_sla_command; embed_sla_command << this->GetOption("CPACK_COMMAND_REZ"); const char* sysroot = this->GetOption("CPACK_OSX_SYSROOT"); - if(sysroot) + if(sysroot && sysroot[0] != '\0') { embed_sla_command << " -isysroot \"" << sysroot << "\""; } |