diff options
| author | Brad King <brad.king@kitware.com> | 2024-06-26 12:43:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-06-26 12:44:02 (GMT) |
| commit | a20377e41afddb974539378cc8065d9e9f38b151 (patch) | |
| tree | 69e0e5226bac46855627d3babf4b923dd2a61357 /Help | |
| parent | 0ffdd6b50fb30e0e203dbfd278665f7cbde6d735 (diff) | |
| parent | 71c631c435c6075ea094ab6fe3104491ab5f9365 (diff) | |
| download | CMake-a20377e41afddb974539378cc8065d9e9f38b151.zip CMake-a20377e41afddb974539378cc8065d9e9f38b151.tar.gz CMake-a20377e41afddb974539378cc8065d9e9f38b151.tar.bz2 | |
Merge topic 'cpack-debian-multiarch'
71c631c435 CPack/DEB: Add Multi-Arch support
55524c48a4 CPack/DEB: Add Multi-Arch support
a022705a2e Tests/RunCMake/CPack: Improve README
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9609
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/cpack_gen/deb.rst | 25 | ||||
| -rw-r--r-- | Help/release/dev/cpack-debian-multiarch.rst | 6 |
2 files changed, 31 insertions, 0 deletions
diff --git a/Help/cpack_gen/deb.rst b/Help/cpack_gen/deb.rst index 23436de..a4063d9 100644 --- a/Help/cpack_gen/deb.rst +++ b/Help/cpack_gen/deb.rst @@ -654,6 +654,31 @@ List of CPack DEB generator specific variables: This value is not interpreted. It is possible to pass an optional revision number of the referenced source package as well. +.. variable:: CPACK_DEBIAN_PACKAGE_MULTIARCH + CPACK_DEBIAN_<COMPONENT>_PACKAGE_MULTIARCH + + Sets the `Multi-Arch` field of the Debian package. + Packages can declare in their control file how they should handle + situations, where packages for different architectures are being installed + on the same machine. + + :Mandatory: No + :Default: + + - An empty string for non-component based installations + - :variable:`CPACK_DEBIAN_PACKAGE_MULTIARCH` for component-based + installations. + + .. versionadded:: 3.31 + Per-component :variable:`!CPACK_DEBIAN_<COMPONENT>_PACKAGE_MULTIARCH` variables. + + See https://wiki.debian.org/MultiArch/Hints + + .. note:: + + This value is validated. It must be one of the following values: + ``same``, ``foreign``, ``allowed``. + Packaging of debug information ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Help/release/dev/cpack-debian-multiarch.rst b/Help/release/dev/cpack-debian-multiarch.rst new file mode 100644 index 0000000..f593103 --- /dev/null +++ b/Help/release/dev/cpack-debian-multiarch.rst @@ -0,0 +1,6 @@ +cpack-debian-multiarch +---------------------- + +* The :cpack_gen:`CPack DEB Generator` gained a + :variable:`CPACK_DEBIAN_PACKAGE_MULTIARCH` option + to support multi-arch packages. |