summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-01-05 15:37:05 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-01-05 15:37:05 (GMT)
commit6ac0063af759fbd51a4065f896e63d3e6b5a2d97 (patch)
tree7df837ab9cbee757ed0b395d2d80a5c08e368b20 /Source
parent51a3c204efb61fe4111095e8b8e29bf6ff399277 (diff)
downloadCMake-6ac0063af759fbd51a4065f896e63d3e6b5a2d97.zip
CMake-6ac0063af759fbd51a4065f896e63d3e6b5a2d97.tar.gz
CMake-6ac0063af759fbd51a4065f896e63d3e6b5a2d97.tar.bz2
BUG: Revert back
Diffstat (limited to 'Source')
-rw-r--r--Source/CPack/cmCPackPackageMakerGenerator.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 4e23d7c..da7eb56 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -73,14 +73,11 @@ int cmCPackPackageMakerGenerator::CompressFiles(const char* outFileName, const c
std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
tmpFile += "/PackageMakerOutput.log";
cmOStringStream pkgCmd;
- /*
- pkgCmd << "sh -c '\"" << this->GetOption("CPACK_INSTALLER_PROGRAM")
+ pkgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM")
<< "\" -build -p \"" << packageDirFileName << "\" -f \"" << this->GetOption("CPACK_TEMPORARY_DIRECTORY")
<< "\" -r \"" << this->GetOption("CPACK_TOPLEVEL_DIRECTORY") << "/Resources\" -i \""
<< this->GetOption("CPACK_TOPLEVEL_DIRECTORY") << "/Info.plist\" -d \""
- << this->GetOption("CPACK_TOPLEVEL_DIRECTORY") << "/Description.plist\"'";
- */
- pkgCmd << "/Users/kitware/Andy/CMake-CPack/foo.sh";
+ << this->GetOption("CPACK_TOPLEVEL_DIRECTORY") << "/Description.plist\"";
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Execute: " << pkgCmd.str().c_str() << std::endl);
std::string output;
int retVal = 1;