diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-08 12:00:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-08 12:01:44 (GMT) |
| commit | 105e108836403379cda176ec0a16fafc0a06464a (patch) | |
| tree | 184d91aee3d16d9fd0a21bef85ee1d534fc7fe23 /Help | |
| parent | 34eefc6ea328092e565f13736e853004aaece640 (diff) | |
| parent | ed1f3a5fa58872143c084fdd9b08a6a4335186c5 (diff) | |
| download | CMake-105e108836403379cda176ec0a16fafc0a06464a.zip CMake-105e108836403379cda176ec0a16fafc0a06464a.tar.gz CMake-105e108836403379cda176ec0a16fafc0a06464a.tar.bz2 | |
Merge topic 'cpack-deb-minor-fixes'
ed1f3a5fa5 CPackDeb: output the error message when no description can be made
ece24b343a Help/cpack_gen/freebsd: improve wording for Debian fallbacks
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6196
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/cpack_gen/freebsd.rst | 4 |
1 files 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. |