diff options
Diffstat (limited to 'Source/CPack/cmCPackGenericGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGenericGenerator.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackGenericGenerator.cxx b/Source/CPack/cmCPackGenericGenerator.cxx index 3e5c0c5085..a491064ec7 100644 --- a/Source/CPack/cmCPackGenericGenerator.cxx +++ b/Source/CPack/cmCPackGenericGenerator.cxx @@ -74,7 +74,6 @@ int cmCPackGenericGenerator::PrepareNames() std::string outName = this->GetOption("CPACK_PACKAGE_FILE_NAME"); tempDirectory += "/" + outName; - outName += "."; outName += this->GetOutputExtension(); std::string destFile = this->GetOption("CPACK_PACKAGE_DIRECTORY"); @@ -82,7 +81,6 @@ int cmCPackGenericGenerator::PrepareNames() std::string outFile = topDirectory + "/" + outName; std::string installPrefix = tempDirectory + this->GetInstallPrefix(); - this->SetOptionIfNotSet("CPACK_TOPLEVEL_DIRECTORY", topDirectory.c_str()); this->SetOptionIfNotSet("CPACK_TEMPORARY_DIRECTORY", tempDirectory.c_str()); this->SetOptionIfNotSet("CPACK_OUTPUT_FILE_NAME", outName.c_str()); @@ -106,7 +104,8 @@ int cmCPackGenericGenerator::PrepareNames() if ( !cmSystemTools::FileExists(descFileName) ) { cmCPackLogger(cmCPackLog::LOG_ERROR, - "Cannot find description file name: " << descFileName << std::endl); + "Cannot find description file name: [" + << descFileName << "]" << std::endl); return 0; } std::ifstream ifs(descFileName); @@ -235,6 +234,7 @@ int cmCPackGenericGenerator::InstallProject() { std::string fileName = tempInstallDirectory; fileName += "/" + *it; + fileName += cmSystemTools::GetExecutableExtension(); cmCPackLogger(cmCPackLog::LOG_VERBOSE, " Strip file: " << fileName.c_str() << std::endl); @@ -344,7 +344,8 @@ int cmCPackGenericGenerator::InstallProjectViaInstalledDirectories( return 0; } std::vector<std::string>::iterator it; - const char* tempDir = this->GetOption("CPACK_TEMPORARY_DIRECTORY"); + const char* tempDir = tempInstallDirectory; +// this->GetOption("CPACK_TEMPORARY_DIRECTORY"); for ( it = installDirectoriesVector.begin(); it != installDirectoriesVector.end(); ++it ) |