summaryrefslogtreecommitdiff
path: root/Help
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2019-11-12 13:16:17 +0000
committerKitware Robot <kwrobot@kitware.com>2019-11-12 08:16:31 -0500
commit27020c81d516707ee2069d343cd058496fa71587 (patch)
tree9c1c768f6aee49e2daee807008b1561a8abd7934 /Help
parent2dcd7ce4ba803fa4c4d27526e45e2c9cbb88e49e (diff)
parent1d1fa5d3e4f3594f1c1db258e526c4b747117aa2 (diff)
downloadcmake-27020c81d516707ee2069d343cd058496fa71587.tar.gz
Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS'
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.rst2
-rw-r--r--Help/release/3.16.rst5
2 files changed, 4 insertions, 3 deletions
diff --git a/Help/manual/cpack.1.rst b/Help/manual/cpack.1.rst
index f82c466a91..395cd4189c 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 1b875fa98e..0d1cc1ed68 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