summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/CPack/tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-01-13 15:23:17 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-01-13 15:23:26 (GMT)
commite61c2ed9acb493d1adca748088a1f34e34f9f726 (patch)
tree38dd6fa2e5a573ceacbf7911ed6f88b0e8266647 /Tests/RunCMake/CPack/tests
parent1d2bead8dd61e4550312dc36a24180ab2f7ff351 (diff)
parentd491f34a5ef303217aef335fdc02a8ff987a6fc8 (diff)
downloadCMake-e61c2ed9acb493d1adca748088a1f34e34f9f726.zip
CMake-e61c2ed9acb493d1adca748088a1f34e34f9f726.tar.gz
CMake-e61c2ed9acb493d1adca748088a1f34e34f9f726.tar.bz2
Merge topic 'fix-cpack-deb-description-file'
d491f34a5e CPack: Fix regression in DEB generator description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4204
Diffstat (limited to 'Tests/RunCMake/CPack/tests')
-rw-r--r--Tests/RunCMake/CPack/tests/DEB_DESCRIPTION/VerifyResult.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Tests/RunCMake/CPack/tests/DEB_DESCRIPTION/VerifyResult.cmake b/Tests/RunCMake/CPack/tests/DEB_DESCRIPTION/VerifyResult.cmake
index e9ac13a..a8e2e7a 100644
--- a/Tests/RunCMake/CPack/tests/DEB_DESCRIPTION/VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/tests/DEB_DESCRIPTION/VerifyResult.cmake
@@ -56,6 +56,8 @@ set(_expected_description [[ Description: This is the summary line
# workaround required!
if(RunCMake_SUBTEST_SUFFIX STREQUAL "CPACK_PACKAGE_DESCRIPTION_FILE" AND PACKAGING_TYPE STREQUAL "MONOLITHIC")
string(APPEND _expected_description "\n ." )
+elseif(RunCMake_SUBTEST_SUFFIX STREQUAL "CPACK_NO_PACKAGE_DESCRIPTION")
+ set(_expected_description [[ Description: This is the summary line]])
endif()
foreach(_file_no RANGE 1 ${EXPECTED_FILES_COUNT})