diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-10 14:34:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-10 14:34:52 (GMT) |
| commit | 2c8eb2696a8f3505d45ed5accfa94b3e5541e169 (patch) | |
| tree | 0c29a188c44d985e0004c10de54bd52176caeaee /Source/CPack/cmCPackDebGenerator.cxx | |
| parent | 039a7df9bada6d061f34728a0bb57fdcb9e277c1 (diff) | |
| parent | 6daa2d384ef7f6f9edd5fed18c830168f7496881 (diff) | |
| download | CMake-2c8eb2696a8f3505d45ed5accfa94b3e5541e169.zip CMake-2c8eb2696a8f3505d45ed5accfa94b3e5541e169.tar.gz CMake-2c8eb2696a8f3505d45ed5accfa94b3e5541e169.tar.bz2 | |
Merge topic 'cpack-deb-md5sums-paths-fix'
6daa2d38 CPack/Deb invalid md5sums file fix
Diffstat (limited to 'Source/CPack/cmCPackDebGenerator.cxx')
| -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()); |