diff options
| author | Eric NOULARD <eric.noulard@gmail.com> | 2011-02-22 21:56:26 (GMT) |
|---|---|---|
| committer | Eric NOULARD <eric.noulard@gmail.com> | 2011-02-22 21:56:26 (GMT) |
| commit | 8c450f6287e45fa737de7d09a4f29ee7f4fdc9dd (patch) | |
| tree | cfd0f7fea93cb53f149ae3110cb5465872c4a2d3 | |
| parent | 62f816adde5312eb97724796efa8e4dff9534f54 (diff) | |
| download | CMake-8c450f6287e45fa737de7d09a4f29ee7f4fdc9dd.zip CMake-8c450f6287e45fa737de7d09a4f29ee7f4fdc9dd.tar.gz CMake-8c450f6287e45fa737de7d09a4f29ee7f4fdc9dd.tar.bz2 | |
CPack remove "-ALL" suffix for ALL-IN-ONE packages
First part fix of feature request 11814
| -rw-r--r-- | Source/CPack/cmCPackArchiveGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/CPack/cmCPackRPMGenerator.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index febf205..ff88412 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -177,7 +177,7 @@ int cmCPackArchiveGenerator::PackageComponentsAllInOne(bool allComponent) packageFileNames.push_back(std::string(toplevel)); packageFileNames[0] += "/" +std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) - +"-ALL" + this->GetOutputExtension(); + + this->GetOutputExtension(); cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Packaging all groups in one package..." "(CPACK_COMPONENTS_ALL_GROUPS_IN_ONE_PACKAGE is set)" diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx index 2d675c1..995adf6 100644 --- a/Source/CPack/cmCPackRPMGenerator.cxx +++ b/Source/CPack/cmCPackRPMGenerator.cxx @@ -158,7 +158,7 @@ int cmCPackRPMGenerator::PackageComponentsAllInOne(bool allComponent) ); std::string outputFileName( std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) - +"-ALL"+ this->GetOutputExtension() + + this->GetOutputExtension() ); // all GROUP in one vs all COMPONENT in one localToplevel += "/"+compInstDirName; |