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/cmCPackArchiveGenerator.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/cmCPackArchiveGenerator.cxx')
-rw-r--r-- | Source/CPack/cmCPackArchiveGenerator.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index ff88412..3c670a1 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -121,9 +121,11 @@ int cmCPackArchiveGenerator::PackageComponents(bool ignoreGroup) << std::endl); // Begin the archive for this group std::string packageFileName= std::string(toplevel); - packageFileName += "/" - +std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) - +"-"+compGIt->first + this->GetOutputExtension(); + packageFileName += "/"+ + GetComponentPackageFileName(this->GetOption("CPACK_PACKAGE_FILE_NAME"), + compGIt->first, + true) + + this->GetOutputExtension(); // open a block in order to automatically close archive // at the end of the block { @@ -154,9 +156,11 @@ int cmCPackArchiveGenerator::PackageComponents(bool ignoreGroup) std::string packageFileName = std::string(toplevel); localToplevel += "/"+ compIt->first; - packageFileName += "/" - +std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) - +"-"+compIt->first + this->GetOutputExtension(); + packageFileName += "/"+ + GetComponentPackageFileName(this->GetOption("CPACK_PACKAGE_FILE_NAME"), + compIt->first, + false) + + this->GetOutputExtension(); { DECLARE_AND_OPEN_ARCHIVE(packageFileName,archive); // Add the files of this component to the archive |