diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2012-02-29 15:29:46 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2012-02-29 15:29:46 (GMT) |
| commit | 5663e436abe7395f4269ba8269d2a869e0b83fab (patch) | |
| tree | bc1bbe7d4a4a86a96b8ad300a884d4d60b0441dc | |
| parent | 4fd479816da0a0ff21c6634ea7c82ff27b321b85 (diff) | |
| download | CMake-5663e436abe7395f4269ba8269d2a869e0b83fab.zip CMake-5663e436abe7395f4269ba8269d2a869e0b83fab.tar.gz CMake-5663e436abe7395f4269ba8269d2a869e0b83fab.tar.bz2 | |
DragNDrop: Fix problem with relocated files in Xcode 4.3
Remove dependency on /Developer/Headers/FlatCarbon when creating SLAs for DMG images.
Instead, of adding those .r files on the command line, include the necessary .r files
from the generated .r file.
| -rw-r--r-- | Source/CPack/cmCPackDragNDropGenerator.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index 83b6b64..3b6135e 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -421,6 +421,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, if(ifs.is_open()) { cmGeneratedFileStream osf(sla_r.c_str()); + osf << "#include <CoreServices/CoreServices.r>\n\n"; osf << SLAHeader; osf << "\n"; osf << "data 'TEXT' (5002, \"English\") {\n"; @@ -481,13 +482,11 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, // Rez the SLA cmOStringStream embed_sla_command; - embed_sla_command << "/bin/bash -c \""; // need expansion of "*.r" embed_sla_command << this->GetOption("CPACK_COMMAND_REZ"); - embed_sla_command << " /Developer/Headers/FlatCarbon/*.r "; - embed_sla_command << "'" << sla_r << "'"; + embed_sla_command << " \"" << sla_r << "\""; embed_sla_command << " -a -o "; - embed_sla_command << "'" << temp_udco << "'\""; - + embed_sla_command << "\"" << temp_udco << "\""; + if(!this->RunCommand(embed_sla_command, &error)) { cmCPackLogger(cmCPackLog::LOG_ERROR, |