diff options
| author | Craig Scott <craig.scott@crascit.com> | 2019-11-12 13:16:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-12 13:16:31 (GMT) |
| commit | 00f5e0206037ceec2d3c33569d1c845fdffa504f (patch) | |
| tree | f9ef1bb0763822238e4ae0ccdb318eba2d05a6bf /Help | |
| parent | 5e328c6d74ed6b6470e1df1005d07fe930185b52 (diff) | |
| parent | 1d1fa5d3e4f3594f1c1db258e526c4b747117aa2 (diff) | |
| download | CMake-00f5e0206037ceec2d3c33569d1c845fdffa504f.zip CMake-00f5e0206037ceec2d3c33569d1c845fdffa504f.tar.gz CMake-00f5e0206037ceec2d3c33569d1c845fdffa504f.tar.bz2 | |
Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS' into release-3.16
1d1fa5d3e4 Tests: Add RunCMake.CPackCommandLine case for multi-config package
108207cc84 CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4025
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cpack.1.rst | 2 | ||||
| -rw-r--r-- | Help/release/3.16.rst | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Help/manual/cpack.1.rst b/Help/manual/cpack.1.rst index f82c466..395cd41 100644 --- a/Help/manual/cpack.1.rst +++ b/Help/manual/cpack.1.rst @@ -55,6 +55,8 @@ Options When the CMake project uses a multi-configuration generator such as Xcode or Visual Studio, this option is needed to tell ``cpack`` which built executables to include in the package. + The user is responsible for ensuring that the configuration(s) listed + have already been built before invoking ``cpack``. ``-D <var>=<value>`` Set a CPack variable. This will override any value set for ``<var>`` in the diff --git a/Help/release/3.16.rst b/Help/release/3.16.rst index 1b875fa..0d1cc1e 100644 --- a/Help/release/3.16.rst +++ b/Help/release/3.16.rst @@ -207,9 +207,8 @@ CTest CPack ----- -* CPack variable :variable:`CPACK_INSTALL_CMAKE_CONFIGURATIONS` was added to - control what configurations are to be packaged for multi-configuration - CMake generators. +* :manual:`cpack(1)` learned support for multiple configurations for ``-C`` + option. * The :cpack_gen:`CPack DEB Generator` is now able to format generic text (usually used as the description for multiple CPack generators) according |