diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-21 12:19:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-21 12:19:52 (GMT) |
| commit | 5737bb37562007b571cd6b4f94bf4d2f2f038136 (patch) | |
| tree | b5e0867c954cbda59cc31753c5f4fcc612296624 /Source/CPack | |
| parent | 5c5b28dd9ddd47db89a09905542597f88d200d67 (diff) | |
| parent | b06870e5ff03da40ac265b8ba3bd84d5223bcf6b (diff) | |
| download | CMake-5737bb37562007b571cd6b4f94bf4d2f2f038136.zip CMake-5737bb37562007b571cd6b4f94bf4d2f2f038136.tar.gz CMake-5737bb37562007b571cd6b4f94bf4d2f2f038136.tar.bz2 | |
Merge topic 'cpack-different-checksum-file-per-generator'
b06870e5 CPack: use a distinct checksum file for each generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1291
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index e72fcc1..f56b5fa 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -999,8 +999,7 @@ int cmCPackGenerator::DoPackage() /* Generate checksum file */ if (crypto.get() != nullptr) { std::string hashFile(this->GetOption("CPACK_OUTPUT_FILE_PREFIX")); - hashFile += - "/" + filename.substr(0, filename.rfind(this->GetOutputExtension())); + hashFile += "/" + filename; hashFile += "." + cmSystemTools::LowerCase(algo); cmsys::ofstream outF(hashFile.c_str()); if (!outF) { |