diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-27 14:27:29 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-27 09:27:36 -0500 |
| commit | 64e3bb4aeed03ec1426c67620e08fa69b6a82702 (patch) | |
| tree | 3097f8ed03bc6e21de86089c65f94433e00bb18c /Modules | |
| parent | ee4299ce46638d87b161003664b0e7bc848a9932 (diff) | |
| parent | baec299ecd350f0b82489e928a770c3ce081958a (diff) | |
| download | cmake-64e3bb4aeed03ec1426c67620e08fa69b6a82702.tar.gz | |
Merge topic 'cpack-deb-fix-description'
baec299ecd CPack: Fix regression in Deb description
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4271
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPack.cmake | 3 | ||||
| -rw-r--r-- | Modules/Internal/CPack/CPackDeb.cmake | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 3b46ca5b93..f6f6320dfb 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -458,12 +458,13 @@ if(NOT DEFINED CPACK_PACKAGE_VERSION) endif() _cpack_set_default(CPACK_PACKAGE_VENDOR "Humanity") +set(CPACK_DEFAULT_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_NAME} built using CMake") if(CMAKE_PROJECT_DESCRIPTION) _cpack_set_default(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_DESCRIPTION}") else() _cpack_set_default(CPACK_PACKAGE_DESCRIPTION_SUMMARY - "${CMAKE_PROJECT_NAME} built using CMake") + "${CPACK_DEFAULT_PACKAGE_DESCRIPTION_SUMMARY}") endif() if(CMAKE_PROJECT_HOMEPAGE_URL) _cpack_set_default(CPACK_PACKAGE_HOMEPAGE_URL diff --git a/Modules/Internal/CPack/CPackDeb.cmake b/Modules/Internal/CPack/CPackDeb.cmake index c74c324d3d..14bb104a0d 100644 --- a/Modules/Internal/CPack/CPackDeb.cmake +++ b/Modules/Internal/CPack/CPackDeb.cmake @@ -540,7 +540,8 @@ function(cpack_deb_prepare_package_vars) # Ok, description has set. According to the `Debian Policy Manual`_ the frist # line is a pacakge summary. Try to get it as well... # See also: https://www.debian.org/doc/debian-policy/ch-controlfields.html#description - elseif(CPACK_PACKAGE_DESCRIPTION_SUMMARY) + elseif(CPACK_PACKAGE_DESCRIPTION_SUMMARY AND + NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY STREQUAL CPACK_DEFAULT_PACKAGE_DESCRIPTION_SUMMARY) # Merge summary w/ the detailed description string(PREPEND CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}\n") endif() |