From ece24b343ad4ce6bfe09817116222456453a2317 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 7 Jun 2021 07:10:58 -0400 Subject: Help/cpack_gen/freebsd: improve wording for Debian fallbacks Documentation should describe what happens, and "we may as well" seems way too conversational. --- Help/cpack_gen/freebsd.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Help/cpack_gen/freebsd.rst b/Help/cpack_gen/freebsd.rst index 2c93569..f429bc5 100644 --- a/Help/cpack_gen/freebsd.rst +++ b/Help/cpack_gen/freebsd.rst @@ -74,7 +74,7 @@ the RPM information (e.g. package license). * Default: - :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION` (this may be set already - for Debian packaging, so we may as well re-use it). + for Debian packaging, so it is used as a fallback). .. variable:: CPACK_FREEBSD_PACKAGE_WWW @@ -87,7 +87,7 @@ the RPM information (e.g. package license). - :variable:`CMAKE_PROJECT_HOMEPAGE_URL`, or if that is not set, :variable:`CPACK_DEBIAN_PACKAGE_HOMEPAGE` (this may be set already - for Debian packaging, so we may as well re-use it). + for Debian packaging, so it is used as a fallback). .. versionadded:: 3.12 The ``CMAKE_PROJECT_HOMEPAGE_URL`` variable. -- cgit v0.12 From ed1f3a5fa58872143c084fdd9b08a6a4335186c5 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 7 Jun 2021 07:11:44 -0400 Subject: CPackDeb: output the error message when no description can be made The `message` command does not support automatic dereferencing. --- Modules/Internal/CPack/CPackDeb.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Internal/CPack/CPackDeb.cmake b/Modules/Internal/CPack/CPackDeb.cmake index 2ef0489..2ceab10 100644 --- a/Modules/Internal/CPack/CPackDeb.cmake +++ b/Modules/Internal/CPack/CPackDeb.cmake @@ -557,7 +557,7 @@ function(cpack_deb_prepare_package_vars) string(APPEND _description_failure_message " or CPACK_DEBIAN_${_local_component_name}_DESCRIPTION") endif() - message(FATAL_ERROR _description_failure_message) + message(FATAL_ERROR "${_description_failure_message}") endif() # Ok, description has set. According to the `Debian Policy Manual`_ the first -- cgit v0.12