summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2023-10-14 21:21:34 (GMT)
committerBrad King <brad.king@kitware.com>2023-11-27 15:26:37 (GMT)
commit53991e62daf819a91b7c89f4d4899d0f94c7fd12 (patch)
tree273a48b4e8f0a5a34e54c582fb101e3cb7529b35 /Help
parentf2a6d423da1400108327bff5a27647b6d1d90392 (diff)
downloadCMake-53991e62daf819a91b7c89f4d4899d0f94c7fd12.zip
CMake-53991e62daf819a91b7c89f4d4899d0f94c7fd12.tar.gz
CMake-53991e62daf819a91b7c89f4d4899d0f94c7fd12.tar.bz2
CPack/RPM: Append .rpm to CPACK_RPM_FILE_NAME if missing
Previously we issued an error when the `.rpm` suffix is missing. Instead, append the suffix automatically. This matches the behavior of `CPACK_ARCHIVE_FILE_NAME`, to which the archive format suffix is automatically appended. With this change, developers can simply do set(CPACK_RPM_comp_FILE_NAME "${CPACK_ARCHIVE_comp_FILE_NAME}")
Diffstat (limited to 'Help')
-rw-r--r--Help/cpack_gen/rpm.rst9
-rw-r--r--Help/release/dev/cpack-auto-suffixes.rst4
2 files changed, 11 insertions, 2 deletions
diff --git a/Help/cpack_gen/rpm.rst b/Help/cpack_gen/rpm.rst
index ebdb721..4a2ce5f 100644
--- a/Help/cpack_gen/rpm.rst
+++ b/Help/cpack_gen/rpm.rst
@@ -89,8 +89,13 @@ List of CPack RPM generator specific variables:
``RPM-DEFAULT``
Tell ``rpmbuild`` to automatically generate the package file name.
- ``<file-name>.rpm``
- Use the given file name. The ``.rpm`` suffix is required.
+ ``<file-name>[.rpm]``
+ Use the given file name.
+
+ .. versionchanged:: 3.29
+
+ The ``.rpm`` suffix will be automatically added if missing.
+ Previously the suffix was required.
.. note::
diff --git a/Help/release/dev/cpack-auto-suffixes.rst b/Help/release/dev/cpack-auto-suffixes.rst
index 678e3f6..f3fd2af 100644
--- a/Help/release/dev/cpack-auto-suffixes.rst
+++ b/Help/release/dev/cpack-auto-suffixes.rst
@@ -4,3 +4,7 @@ cpack-auto-suffixes
* The :cpack_gen:`CPack DEB Generator` :variable:`CPACK_DEBIAN_FILE_NAME`
variable may now be set without any suffix, and the ``.deb`` suffix
will be added automatically.
+
+* The :cpack_gen:`CPack RPM Generator` :variable:`CPACK_RPM_FILE_NAME`
+ variable may now be set without any suffix, and the ``.rpm`` suffix
+ will be added automatically.