From 108207cc849b3c6f3de57c5ba8676465510d0849 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Sun, 10 Nov 2019 14:33:05 +0200 Subject: CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS In commit da5ac4bb60 (cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variable, 2019-07-10, v3.16.0-rc1~165^2) we added both the variable and support for `cpack -C` with multiple configurations. Drop the variable because the `package` target cannot ensure that all of the configurations are built. Keep the command-line interface so that it can be used manually in scripts. Fixes: #19918 --- Help/manual/cpack.1.rst | 2 ++ Help/release/3.16.rst | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'Help') 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 =`` Set a CPack variable. This will override any value set for ```` in the diff --git a/Help/release/3.16.rst b/Help/release/3.16.rst index 570f536cdc..847f0dcf62 100644 --- a/Help/release/3.16.rst +++ b/Help/release/3.16.rst @@ -205,9 +205,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 -- cgit v1.2.1