kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cpack: For DragNDrop generator, add sysroot option when calling Rez.

This commit is contained in:
Clinton Stimpson 2013-11-01 05:31:07 -06:00
parent 193029c4aa
commit 53d6ebb360
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/CPack.cmake
View File

@ -519,9 +519,9 @@ cpack_set_if_not_set(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
# WiX specific variables # WiX specific variables
cpack_set_if_not_set(CPACK_WIX_SIZEOF_VOID_P "${CMAKE_SIZEOF_VOID_P}") 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) if(CMAKE_OSX_SYSROOT)
set(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") cpack_set_if_not_set(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
endif() endif()
if(DEFINED CPACK_COMPONENTS_ALL) if(DEFINED CPACK_COMPONENTS_ALL)

2
Source/CPack/cmCPackDragNDropGenerator.cxx
View File

@ -505,7 +505,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
cmOStringStream embed_sla_command; cmOStringStream embed_sla_command;
embed_sla_command << this->GetOption("CPACK_COMMAND_REZ"); embed_sla_command << this->GetOption("CPACK_COMMAND_REZ");
const char* sysroot = this->GetOption("CPACK_OSX_SYSROOT"); const char* sysroot = this->GetOption("CPACK_OSX_SYSROOT");
if(sysroot) if(sysroot && sysroot[0] != '\0')
{ {
embed_sla_command << " -isysroot \"" << sysroot << "\""; embed_sla_command << " -isysroot \"" << sysroot << "\"";
} }