diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2013-11-01 02:14:58 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2013-11-01 02:25:12 (GMT) |
| commit | 193029c4aaad7a13f0b6efed59a1c88af0dc6714 (patch) | |
| tree | 799253f78297f9c32ea074d47e1bbedc88f873d4 /Source/CPack | |
| parent | 7a616e75b84d692e2df453e889c12d1afdb6c576 (diff) | |
| download | CMake-193029c4aaad7a13f0b6efed59a1c88af0dc6714.zip CMake-193029c4aaad7a13f0b6efed59a1c88af0dc6714.tar.gz CMake-193029c4aaad7a13f0b6efed59a1c88af0dc6714.tar.bz2 | |
cpack: For DragNDrop generator, add sysroot option when calling Rez.
Also adding overwrite option (-ov) in case multiple temporary
dmg files are being created.
Fixes bug #14536.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackDragNDropGenerator.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index d973c01..ab386d3 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -474,7 +474,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, udco_image_command << this->GetOption("CPACK_COMMAND_HDIUTIL"); udco_image_command << " convert \"" << temp_image << "\""; udco_image_command << " -format UDCO"; - udco_image_command << " -o \"" << temp_udco << "\""; + udco_image_command << " -ov -o \"" << temp_udco << "\""; std::string error; if(!this->RunCommand(udco_image_command, &error)) @@ -504,6 +504,11 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, // Rez the SLA cmOStringStream embed_sla_command; embed_sla_command << this->GetOption("CPACK_COMMAND_REZ"); + const char* sysroot = this->GetOption("CPACK_OSX_SYSROOT"); + if(sysroot) + { + embed_sla_command << " -isysroot \"" << sysroot << "\""; + } embed_sla_command << " \"" << sla_r << "\""; embed_sla_command << " -a -o "; embed_sla_command << "\"" << temp_udco << "\""; |