Skip to content
Snippets Groups Projects
Commit 105e1088 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'cpack-deb-minor-fixes'


ed1f3a5f CPackDeb: output the error message when no description can be made
ece24b34 Help/cpack_gen/freebsd: improve wording for Debian fallbacks

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarKyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6196
parents 34eefc6e ed1f3a5f
No related branches found
No related tags found
No related merge requests found
......@@ -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.
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment