diff options
| author | Eric NOULARD <eric.noulard@gmail.com> | 2011-02-22 22:49:49 (GMT) |
|---|---|---|
| committer | Eric NOULARD <eric.noulard@gmail.com> | 2011-02-22 22:49:49 (GMT) |
| commit | 4deb308e82b8f9e56ce41eba211f330ff66902a3 (patch) | |
| tree | 2c502c55b9eb04976fd926e98e1744999cd5ec92 /Source/CPack/cmCPackRPMGenerator.cxx | |
| parent | 8c450f6287e45fa737de7d09a4f29ee7f4fdc9dd (diff) | |
| download | CMake-4deb308e82b8f9e56ce41eba211f330ff66902a3.zip CMake-4deb308e82b8f9e56ce41eba211f330ff66902a3.tar.gz CMake-4deb308e82b8f9e56ce41eba211f330ff66902a3.tar.bz2 | |
CPack Authorize DISPLAY_NAME usage in component package
Second (last) part fix of feature request #11814
Diffstat (limited to 'Source/CPack/cmCPackRPMGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackRPMGenerator.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx index 995adf6..5803959 100644 --- a/Source/CPack/cmCPackRPMGenerator.cxx +++ b/Source/CPack/cmCPackRPMGenerator.cxx @@ -60,8 +60,10 @@ int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup) cmSystemTools::GetParentDirectory(toplevel.c_str()) ); std::string outputFileName( - std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) - +"-"+compGIt->first + this->GetOutputExtension() + GetComponentPackageFileName(this->GetOption("CPACK_PACKAGE_FILE_NAME"), + compGIt->first, + true) + + this->GetOutputExtension() ); localToplevel += "/"+ compGIt->first; @@ -98,9 +100,10 @@ int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup) cmSystemTools::GetParentDirectory(toplevel.c_str()) ); std::string outputFileName( - std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME") - ) - +"-"+compIt->first + this->GetOutputExtension()); + GetComponentPackageFileName(this->GetOption("CPACK_PACKAGE_FILE_NAME"), + compIt->first, + false) + + this->GetOutputExtension()); localToplevel += "/"+ compIt->first; /* replace the TEMP DIRECTORY with the component one */ |