kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPack remove "-ALL" suffix for ALL-IN-ONE packages

Browse Source 
First part fix of feature request 11814
This commit is contained in:
Eric NOULARD 2011-02-22 22:56:26 +01:00
parent 62f816adde
commit 8c450f6287
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CPack/cmCPackArchiveGenerator.cxx
View File

@ -177,7 +177,7 @@ int cmCPackArchiveGenerator::PackageComponentsAllInOne(bool allComponent)
packageFileNames.push_back(std::string(toplevel)); packageFileNames.push_back(std::string(toplevel));
packageFileNames[0] += "/" packageFileNames[0] += "/"
+std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) +std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
+"-ALL" + this->GetOutputExtension(); + this->GetOutputExtension();
cmCPackLogger(cmCPackLog::LOG_VERBOSE, cmCPackLogger(cmCPackLog::LOG_VERBOSE,
"Packaging all groups in one package..." "Packaging all groups in one package..."
"(CPACK_COMPONENTS_ALL_GROUPS_IN_ONE_PACKAGE is set)" "(CPACK_COMPONENTS_ALL_GROUPS_IN_ONE_PACKAGE is set)"

2
Source/CPack/cmCPackRPMGenerator.cxx
View File

@ -158,7 +158,7 @@ int cmCPackRPMGenerator::PackageComponentsAllInOne(bool allComponent)
); );
std::string outputFileName( std::string outputFileName(
std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
+"-ALL"+ this->GetOutputExtension() + this->GetOutputExtension()
); );
// all GROUP in one vs all COMPONENT in one // all GROUP in one vs all COMPONENT in one
localToplevel += "/"+compInstDirName; localToplevel += "/"+compInstDirName;