This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via bec38523de60cd7602b0fa89d38356c6f5e7cddd (commit)
via 27020c81d516707ee2069d343cd058496fa71587 (commit)
via 00f5e0206037ceec2d3c33569d1c845fdffa504f (commit)
via 1d1fa5d3e4f3594f1c1db258e526c4b747117aa2 (commit)
via 108207cc849b3c6f3de57c5ba8676465510d0849 (commit)
from 2dcd7ce4ba803fa4c4d27526e45e2c9cbb88e49e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bec38523de60cd7602b0fa89d38356c6f5e7cddd
commit bec38523de60cd7602b0fa89d38356c6f5e7cddd
Merge: 27020c81d5 00f5e02060
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Tue Nov 12 13:16:17 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 12 08:16:32 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27020c81d516707ee2069d343cd058496fa71587
commit 27020c81d516707ee2069d343cd058496fa71587
Merge: 2dcd7ce4ba 1d1fa5d3e4
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Tue Nov 12 13:16:17 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 12 08:16:31 2019 -0500
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 <kwro...@kitware.com>
Merge-request: !4025
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cpack.1.rst | 2 ++
Help/release/3.16.rst | 5 ++---
Modules/CPack.cmake | 7 -------
Source/CPack/cmCPackGenerator.cxx | 8 --------
Tests/RunCMake/CPack/RunCMakeTest.cmake | 3 ---
.../ExpectedFiles.cmake | 3 ---
.../ZIP-stdout.txt | 3 ---
.../CPACK_INSTALL_CMAKE_CONFIGURATIONS/test.cmake | 9 ---------
.../CMakeLists.txt | 1 -
.../CPackCommandLine/MultiConfig-check-stdout.txt | 4 ++++
.../MultiConfig-package-stdout.txt | 8 ++++++++
Tests/RunCMake/CPackCommandLine/MultiConfig.cmake | 9 +++++++++
Tests/RunCMake/CPackCommandLine/RunCMakeTest.cmake | 23 ++++++++++++++++++++++
.../CPackCommandLine}/foo.c | 0
14 files changed, 48 insertions(+), 37 deletions(-)
delete mode 100644
Tests/RunCMake/CPack/tests/CPACK_INSTALL_CMAKE_CONFIGURATIONS/ExpectedFiles.cmake
delete mode 100644
Tests/RunCMake/CPack/tests/CPACK_INSTALL_CMAKE_CONFIGURATIONS/ZIP-stdout.txt
delete mode 100644
Tests/RunCMake/CPack/tests/CPACK_INSTALL_CMAKE_CONFIGURATIONS/test.cmake
copy Tests/RunCMake/{INSTALL_NAME_DIR => CPackCommandLine}/CMakeLists.txt (63%)
create mode 100644 Tests/RunCMake/CPackCommandLine/MultiConfig-check-stdout.txt
create mode 100644
Tests/RunCMake/CPackCommandLine/MultiConfig-package-stdout.txt
create mode 100644 Tests/RunCMake/CPackCommandLine/MultiConfig.cmake
copy Tests/{Architecture => RunCMake/CPackCommandLine}/foo.c (100%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
