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 /Source | |
| 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 'Source')
| -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..dfb2f15 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 && sysroot[0] != '\0') + { + embed_sla_command << " -isysroot \"" << sysroot << "\""; + } embed_sla_command << " \"" << sla_r << "\""; embed_sla_command << " -a -o "; embed_sla_command << "\"" << temp_udco << "\""; |