diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-24 17:54:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-24 17:54:03 (GMT) |
| commit | a98a699987dde6576399474a24bff42c4d1317ad (patch) | |
| tree | 208544ef0e288afb3850ff28bb9f06473f519f55 /Source | |
| parent | 384de98709ee6b8bf49c2d52b89d04d09a7c4b58 (diff) | |
| parent | adbd3985f89f19d9de867a75321465d6e181908d (diff) | |
| download | CMake-a98a699987dde6576399474a24bff42c4d1317ad.zip CMake-a98a699987dde6576399474a24bff42c4d1317ad.tar.gz CMake-a98a699987dde6576399474a24bff42c4d1317ad.tar.bz2 | |
Merge topic 'cpack-deb-different-package-names'
adbd3985 CPack/Deb possibility to change package name
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 7675677..7fd76df 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -57,8 +57,8 @@ int cmCPackDebGenerator::PackageOnePack(std::string initialTopLevel, // Begin the archive for this pack std::string localToplevel(initialTopLevel); std::string packageFileName(cmSystemTools::GetParentDirectory(toplevel)); - std::string outputFileName(cmsys::SystemTools::LowerCase(std::string( - this->GetOption("CPACK_PACKAGE_FILE_NAME"))) + + std::string outputFileName(std::string( + this->GetOption("CPACK_PACKAGE_FILE_NAME")) + "-" + packageName + this->GetOutputExtension()); localToplevel += "/" + packageName; @@ -174,8 +174,8 @@ int cmCPackDebGenerator::PackageComponentsAllInOne( // The ALL GROUPS in ONE package case std::string localToplevel(initialTopLevel); std::string packageFileName(cmSystemTools::GetParentDirectory(toplevel)); - std::string outputFileName(cmsys::SystemTools::LowerCase(std::string( - this->GetOption("CPACK_PACKAGE_FILE_NAME"))) + + std::string outputFileName(std::string( + this->GetOption("CPACK_PACKAGE_FILE_NAME")) + this->GetOutputExtension()); // all GROUP in one vs all COMPONENT in one localToplevel += "/" + compInstDirName; |