diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2016-12-20 22:08:52 (GMT) |
|---|---|---|
| committer | Domen Vrankar <domen.vrankar@gmail.com> | 2016-12-23 20:10:52 (GMT) |
| commit | 6daa2d384ef7f6f9edd5fed18c830168f7496881 (patch) | |
| tree | 5ec6294059e6f975873652c59958d912f8290c44 /Source/CPack | |
| parent | 4918cd8c98938ab245d7fea74ba6e20f3ec8ef8b (diff) | |
| download | CMake-6daa2d384ef7f6f9edd5fed18c830168f7496881.zip CMake-6daa2d384ef7f6f9edd5fed18c830168f7496881.tar.gz CMake-6daa2d384ef7f6f9edd5fed18c830168f7496881.tar.bz2 | |
CPack/Deb invalid md5sums file fix
Monolithic deb packages were packaged
with invalid md5sums file as trailing
slash in path was causing string replace
to fail and preserve build path.
Fixes #16517
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 36566a4..5c50da8 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -173,7 +173,11 @@ int cmCPackDebGenerator::PackageComponentsAllInOne( std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) + this->GetOutputExtension()); // all GROUP in one vs all COMPONENT in one - localToplevel += "/" + compInstDirName; + // if must be here otherwise non component paths have a trailing / while + // components don't + if (!compInstDirName.empty()) { + localToplevel += "/" + compInstDirName; + } /* replace the TEMP DIRECTORY with the component one */ this->SetOption("CPACK_TEMPORARY_DIRECTORY", localToplevel.c_str()); |