diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2016-05-23 17:51:33 (GMT) |
|---|---|---|
| committer | Domen Vrankar <domen.vrankar@gmail.com> | 2016-05-23 17:55:46 (GMT) |
| commit | adbd3985f89f19d9de867a75321465d6e181908d (patch) | |
| tree | d910cf142bdc41d81a8d1402b4ddb6e3b5d53a67 /Source | |
| parent | c75d91a05c9f442582726e3e80fec41d016da76f (diff) | |
| download | CMake-adbd3985f89f19d9de867a75321465d6e181908d.zip CMake-adbd3985f89f19d9de867a75321465d6e181908d.tar.gz CMake-adbd3985f89f19d9de867a75321465d6e181908d.tar.bz2 | |
CPack/Deb possibility to change package name
This patch preserves backward compatibility of
deb package names with previous CMake versions
but similarly to CPack/RPM allows to change
package name format and supports DEB-DEFAULT
setting that produces proper Debian package names.
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; |