diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-18 16:16:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-18 16:16:44 (GMT) |
| commit | cbcb507227a12daeced0fef6735c1a0fd0f9c52a (patch) | |
| tree | 9294e427efd50a060474ff4024fc4760021b2029 | |
| parent | 28523d63ffc0e155bd7c32630d132f2c4418fd1c (diff) | |
| parent | 8f3367449183608fbae0de171825e75da8f6b79a (diff) | |
| download | CMake-cbcb507227a12daeced0fef6735c1a0fd0f9c52a.zip CMake-cbcb507227a12daeced0fef6735c1a0fd0f9c52a.tar.gz CMake-cbcb507227a12daeced0fef6735c1a0fd0f9c52a.tar.bz2 | |
Merge topic 'issue-17794'
8f33674491 cpack(DEB): Issue warning if custom script for control file is missing
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5705
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 9 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 43dbdb5..1220514 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -396,6 +396,15 @@ bool DebGenerator::generateControlTar(std::string const& md5Filename) const } // if we can copy the file, it means it does exist, let's add it: + if (!cmsys::SystemTools::FileExists(i)) { + cmCPackLogger(cmCPackLog::LOG_WARNING, + "Adding file to tar:" << std::endl + << "#top level directory: " + << this->WorkDir << std::endl + << "#missing file: " << i + << std::endl); + } + if (cmsys::SystemTools::CopyFileIfDifferent(i, localcopy)) { control_tar.Add(localcopy, this->WorkDir.length(), "."); } diff --git a/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt b/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt new file mode 100644 index 0000000..37360e8 --- /dev/null +++ b/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt @@ -0,0 +1,6 @@ +CPack Warning: Adding file to tar: +#top level directory: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/_CPack_Packages/Linux/DEB/extra-0.1.1-Linux/bas +#missing file: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/conffiles +CPack Warning: Adding file to tar: +#top level directory: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/_CPack_Packages/Linux/DEB/extra-0.1.1-Linux/foo +#missing file: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/conffiles |