[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-272-gce7408514c
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 ce7408514c98d39612c7f1e1d85929c223f71068 (commit) via a0e2e0ca9725996c5ff4662f84d9bca8ea4edd35 (commit) via deeab72aae14de3bfce4189ea5e9ee42e7ad94dc (commit) via 3c85f11fedf55c5072cd00deb129a0782130d78c (commit) via 2ec1156b80485fedba5b6d9b0802c21e1cbc2d8f (commit) from 0ff5bdd4c99824bb6e4b1c19f6f9f9e47ee96088 (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=ce7408514c98d39612c7f1e1d85929c223f71068 commit ce7408514c98d39612c7f1e1d85929c223f71068 Merge: 0ff5bdd4c9 a0e2e0ca97 Author: Brad King AuthorDate: Wed Nov 6 14:32:13 2019 + Commit: Kitware Robot CommitDate: Wed Nov 6 09:32:22 2019 -0500 Merge topic 'install-name-dir-genex' a0e2e0ca97 Help: Add documentation and release notes for INSTALL_NAME_DIR genex deeab72aae Tests: Add tests for INSTALL_NAME_DIR 3c85f11fed INSTALL_NAME_DIR: Add support for generator expressions 2ec1156b80 Refactor: Generalize cmExportInstallFileGenerator::ReplaceInstallPrefix() Acked-by: Kitware Robot Merge-request: !3989 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0e2e0ca9725996c5ff4662f84d9bca8ea4edd35 commit a0e2e0ca9725996c5ff4662f84d9bca8ea4edd35 Author: Kyle Edwards AuthorDate: Mon Nov 4 12:08:53 2019 -0500 Commit: Kyle Edwards CommitDate: Mon Nov 4 19:02:16 2019 -0500 Help: Add documentation and release notes for INSTALL_NAME_DIR genex diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 75f4bd48a2..691481b992 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -596,7 +596,8 @@ Target-Dependent Queries requirement. ``$`` Content of the install prefix when the target is exported via - :command:`install(EXPORT)` and empty otherwise. + :command:`install(EXPORT)`, or when evaluated in + :prop_tgt:`INSTALL_NAME_DIR`, and empty otherwise. Output-Related Expressions -- diff --git a/Help/prop_tgt/INSTALL_NAME_DIR.rst b/Help/prop_tgt/INSTALL_NAME_DIR.rst index 2216072acb..747615ac8e 100644 --- a/Help/prop_tgt/INSTALL_NAME_DIR.rst +++ b/Help/prop_tgt/INSTALL_NAME_DIR.rst @@ -10,3 +10,7 @@ installed targets. This property is initialized by the value of the variable :variable:`CMAKE_INSTALL_NAME_DIR` if it is set when a target is created. + +This property supports :manual:`generator expressions `. +In particular, the ``$`` generator expression can be used to set the +directory relative to the install-time prefix. diff --git a/Help/release/dev/install-name-dir-genex.rst b/Help/release/dev/install-name-dir-genex.rst new file mode 100644 index 00..0cb41f08d9 --- /dev/null +++ b/Help/release/dev/install-name-dir-genex.rst @@ -0,0 +1,7 @@ +install-name-dir-genex +-- + +* The :prop_tgt:`INSTALL_NAME_DIR` target property now supports + :manual:`generator expressions `. + In particular, the ``$`` generator expression can + be used to set the directory relative to the install-time prefix. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=deeab72aae14de3bfce4189ea5e9ee42e7ad94dc commit deeab72aae14de3bfce4189ea5e9ee42e7ad94dc Author: Kyle Edwards AuthorDate: Mon Nov 4 12:01:44 2019 -0500 Commit: Kyle Edwards CommitDate: Mon Nov 4 19:02:16 2019 -0500 Tests: Add tests for INSTALL_NAME_DIR diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 31b280b779..449075122a 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -290,6 +290,9 @@ add_RunCMake_test(set_property) add_RunCMake_test(string) add_RunCMake_test(test_include_dirs) add_RunCMake_test(BundleUtilities) +if(APPLE) + add_RunCMake_test(INSTALL_NAME_DIR) +endif() function(add_RunCMake_test_try_compile) if(CMAKE_VERSION VERSION_LESS 3.9.20170907 AND "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") diff --git a/Tests/RunCMake/INSTALL_NAME_DIR/CMakeLists.txt b/Tests/RunCMake/INSTALL_NAME_DIR/CMakeLists.txt new file mode 100644 index 00..5253d3479e --- /dev/null +++ b/Tests/RunCMake/INSTALL_NAME_DIR/CMakeLists.txt @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 3.16) +project(${RunCMake_TEST} NONE) +include(${CMAKE_CURRENT_LIST_DIR}/INSTALL_NAME_DIR.cmake) +include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/INSTALL_NAME_DIR/INSTALL_NAME_DIR.cmake b/Tests/RunCMake/INSTALL_NAME_DIR/INSTALL_NAME_DIR.cmake new file mode 100644 index 00..eaa0b4
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-41-gef86e8991b
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, release has been updated via ef86e8991b6b9b2d4b25f98a95ba950f9ba19485 (commit) via bae7a82ffab7350ae55a104d85d91b5d36347cae (commit) via 0ce8a5c08de0852f22f9be595c6f08a4a6c865e9 (commit) via 9457c95aa033aa192b0fbe2796e3a660a660d0ad (commit) via 77a01c398f20bf41921d73082f469acf6c9e0acf (commit) from e0ec13059a04491c601e158c137cddc0802a410c (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 - --- Summary of changes: Modules/FindBoost.cmake| 3 +++ Source/cmGlobalXCodeGenerator.cxx | 24 +- ...-check.cmake => ImplicitCMakeLists-check.cmake} | 4 ++-- .../RunCMake/XcodeProject/ImplicitCMakeLists.cmake | 0 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 1 + 5 files changed, 20 insertions(+), 12 deletions(-) copy Tests/RunCMake/XcodeProject/{ExplicitCMakeLists-check.cmake => ImplicitCMakeLists-check.cmake} (80%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/XcodeProject/ImplicitCMakeLists.cmake (100%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-267-g0ff5bdd4c9
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 0ff5bdd4c99824bb6e4b1c19f6f9f9e47ee96088 (commit) via 0618f8b3ed690275c87e5494084f33a6d3a07be7 (commit) via 7b2e9b5537af2977e6096d0c2cad1a2b94e11002 (commit) via 9d8bb7bc4e09131055a1ff542f655a4168cda9ca (commit) via ef86e8991b6b9b2d4b25f98a95ba950f9ba19485 (commit) via a43c25a2e3aa2ad32af99850b55240ce088f0483 (commit) via bae7a82ffab7350ae55a104d85d91b5d36347cae (commit) via 30908fa0ee965a67c6dbdc554c67038d14bca7d6 (commit) via 0ce8a5c08de0852f22f9be595c6f08a4a6c865e9 (commit) via 9457c95aa033aa192b0fbe2796e3a660a660d0ad (commit) via 68b5af65fa09c90278826898f199d289c049a01d (commit) via 77a01c398f20bf41921d73082f469acf6c9e0acf (commit) via d5d5ba3f7fe7dd5a52e6671387128cb9a901ec1e (commit) via 005aba29a1b5774b778bb65f4751a572d628589f (commit) via 93b66735ac2092675eec7a636625df84ff306fdc (commit) from 48d3b83b9dd3a97874f560660a21b7af8e10 (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=0ff5bdd4c99824bb6e4b1c19f6f9f9e47ee96088 commit 0ff5bdd4c99824bb6e4b1c19f6f9f9e47ee96088 Merge: 0618f8b3ed d5d5ba3f7f Author: Brad King AuthorDate: Wed Nov 6 14:29:12 2019 + Commit: Kitware Robot CommitDate: Wed Nov 6 09:29:22 2019 -0500 Merge topic 'ccmake_colored_values' d5d5ba3f7f ccmake: Identify the current cache entry 005aba29a1 ccmake: Improve display of the key controls 93b66735ac ccmake: Use type-based colors to display cache values Acked-by: Kitware Robot Merge-request: !3955 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0618f8b3ed690275c87e5494084f33a6d3a07be7 commit 0618f8b3ed690275c87e5494084f33a6d3a07be7 Merge: 7b2e9b5537 68b5af65fa Author: Brad King AuthorDate: Wed Nov 6 14:27:56 2019 + Commit: Kitware Robot CommitDate: Wed Nov 6 09:28:05 2019 -0500 Merge topic 'cpack-nsis-welcome-finish-title' 68b5af65fa CPack/NSIS: Add options for custom welcome/finish titles + display on 3 lines Acked-by: Kitware Robot Merge-request: !3980 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b2e9b5537af2977e6096d0c2cad1a2b94e11002 commit 7b2e9b5537af2977e6096d0c2cad1a2b94e11002 Merge: 9d8bb7bc4e ef86e8991b Author: Brad King AuthorDate: Wed Nov 6 14:25:34 2019 + Commit: Kitware Robot CommitDate: Wed Nov 6 09:25:43 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d8bb7bc4e09131055a1ff542f655a4168cda9ca commit 9d8bb7bc4e09131055a1ff542f655a4168cda9ca Merge: a43c25a2e3 77a01c398f Author: Brad King AuthorDate: Wed Nov 6 14:25:34 2019 + Commit: Kitware Robot CommitDate: Wed Nov 6 09:25:43 2019 -0500 Merge topic 'FindBoost-meta-component-ALL' 77a01c398f FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73 Acked-by: Kitware Robot Merge-request: !3996 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a43c25a2e3aa2ad32af99850b55240ce088f0483 commit a43c25a2e3aa2ad32af99850b55240ce088f0483 Merge: 30908fa0ee bae7a82ffa Author: Brad King AuthorDate: Wed Nov 6 14:23:47 2019 + Commit: Kitware Robot CommitDate: Wed Nov 6 09:23:56 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30908fa0ee965a67c6dbdc554c67038d14bca7d6 commit 30908fa0ee965a67c6dbdc554c67038d14bca7d6 Merge: 48d3b83b9d 0ce8a5c08d Author: Brad King AuthorDate: Wed Nov 6 14:23:47 2019 + Commit: Kitware Robot CommitDate: Wed Nov 6 09:23:56 2019 -0500 Merge topic 'xcode-restore-CMakeLists' 0ce8a5c08d Xcode: Fix generated references to CMakeLists.txt files 9457c95aa0 cmGlobalXCodeGenerator: Mark known source locations Acked-by: Kitware Robot Merge-request: !3999 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68b5af65fa09c90278826898f199d289c049a01d commit 68b5af65fa09c90278826898f199d289c049a01d Author: Johnny Jazeix AuthorDate: Tue Nov 5 20:09:53 2019 +0100 Commit: Johnny Jazeix CommitDate: Tue Nov 5 20:09:53 2019 +0100 CPack/NSIS: Add options for custom welcome/finish titles + display on 3 lines Fixes: #11275 diff --git a/Help/cpack_gen/nsis.rst b/Help/cpack_gen/nsis.rst index 38676c4659..dc6524938c 100644 --- a/Help/cpack_gen/nsis.rst +++ b/Help/cpack_gen/nsis.rst @@ -133,3 +133,19 @@ on Windows Nullsoft Scriptable Install System. Specify the name of the program to uninstall the version. Default is ``Uninsta
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-252-g48d3b83b9d
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 48d3b83b9dd3a97874f560660a21b7af8e10 (commit) via 7046d4cbe5841f4635c91d07ee667d1cd3a1c40e (commit) via e0ec13059a04491c601e158c137cddc0802a410c (commit) via 4af39fe25b5f8de9cebec2f1b549f2212d3f033f (commit) via d0be4d53655f1651fe7ff3c61a668ffc3fd4bbf9 (commit) via 4dd6ad20b696d717833130e0d4e7b60f0f287752 (commit) via 821bfca89b862ed207c2aeafe2d5e38e2c9afb93 (commit) via 32d8de1463a03243fca614a2ea45278f705517c3 (commit) via 2fae9101e537018fbe2916a39aa361eb122ba97a (commit) from 099f6c300aabb050902fe248dbbf1487cf494d61 (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=48d3b83b9dd3a97874f560660a21b7af8e10 commit 48d3b83b9dd3a97874f560660a21b7af8e10 Merge: 7046d4cbe5 e0ec13059a Author: Craig Scott AuthorDate: Wed Nov 6 10:51:09 2019 + Commit: Kitware Robot CommitDate: Wed Nov 6 05:51:26 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7046d4cbe5841f4635c91d07ee667d1cd3a1c40e commit 7046d4cbe5841f4635c91d07ee667d1cd3a1c40e Merge: 099f6c300a 4af39fe25b Author: Craig Scott AuthorDate: Wed Nov 6 10:51:09 2019 + Commit: Kitware Robot CommitDate: Wed Nov 6 05:51:26 2019 -0500 Merge topic 'doc-discourse' 4af39fe25b CMakeSystemSpecificInformation: Replace mailing list with Discourse Forum d0be4d5365 README: Replace link to mailing list the CMake Discourse Forum 4dd6ad20b6 README: Update links to cmake.org pages 821bfca89b Help: Replace links to mailing lists with links to our Discourse Forum 32d8de1463 CMakeCPack: Update Debian package contact email 2fae9101e5 Help/dev: Update maintainer guide for Discourse transition Acked-by: Kitware Robot Merge-request: !3998 --- Summary of changes: CMakeCPack.cmake | 2 +- Help/dev/maint.rst | 11 ++- Help/manual/LINKS.txt| 10 +++--- Modules/CMakeSystemSpecificInformation.cmake | 6 +++--- README.rst | 12 ++-- 5 files changed, 19 insertions(+), 22 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-36-ge0ec13059a
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, release has been updated via e0ec13059a04491c601e158c137cddc0802a410c (commit) via 4af39fe25b5f8de9cebec2f1b549f2212d3f033f (commit) via d0be4d53655f1651fe7ff3c61a668ffc3fd4bbf9 (commit) via 4dd6ad20b696d717833130e0d4e7b60f0f287752 (commit) via 821bfca89b862ed207c2aeafe2d5e38e2c9afb93 (commit) via 32d8de1463a03243fca614a2ea45278f705517c3 (commit) via 2fae9101e537018fbe2916a39aa361eb122ba97a (commit) from 3c0a317a1d111fb1012de45c39b81048f5a700d9 (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 - --- Summary of changes: CMakeCPack.cmake | 2 +- Help/dev/maint.rst | 11 ++- Help/manual/LINKS.txt| 10 +++--- Modules/CMakeSystemSpecificInformation.cmake | 6 +++--- README.rst | 12 ++-- 5 files changed, 19 insertions(+), 22 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-243-g099f6c300a
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 099f6c300aabb050902fe248dbbf1487cf494d61 (commit) from 370fe1495b4109430b2cb250dd3afd1ce9401cf6 (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=099f6c300aabb050902fe248dbbf1487cf494d61 commit 099f6c300aabb050902fe248dbbf1487cf494d61 Author: Kitware Robot AuthorDate: Wed Nov 6 00:01:08 2019 -0500 Commit: Kitware Robot CommitDate: Wed Nov 6 00:01:08 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7425c0fcdc..c8e91089da 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191105) +set(CMake_VERSION_PATCH 20191106) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-29-g3c0a317a1d
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, release has been updated via 3c0a317a1d111fb1012de45c39b81048f5a700d9 (commit) via 0ec60a400234624b258307a7944184828c8b6abc (commit) via 408a3a7d5e21d6b49af5d9b3b7e59f3286cd32b7 (commit) via 602189bb7b5f62a28e101cf0ed51572d2bf92f2f (commit) via 2d83709038a40fd15abba23812150e78da963960 (commit) via 53cd86ea7846b55b7cb21886ea77482e626bbeb4 (commit) via e992d62b7e15be28c8d560071bcf847f28d9fbb1 (commit) via 3c0ca5a9d9d538da41e99207da22f55496bdf553 (commit) via dd05ef429ab9f2d0377efba7a2bca1bb7181dc2f (commit) via ac8de0dbcfdefa431e4a32c4fd469cb5ac83af36 (commit) via e331367a898c6e0afa386c52fc7bd4d84d75ec29 (commit) from c831e409a53a33c3b3bdbaa9c19be5ae3364e1f6 (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 - --- Summary of changes: Help/manual/cmake-compile-features.7.rst | 14 - Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst | 10 +++ Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst | 6 ++-- Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst | 18 .../CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst | 10 +++ Modules/Compiler/GNU.cmake | 2 ++ Modules/FindPostgreSQL.cmake | 21 + Modules/Platform/Windows-Clang.cmake | 3 -- Source/cmGeneratorTarget.cxx | 34 ++ Source/cmInstallTargetGenerator.cxx| 2 +- Source/cmLocalGenerator.cxx| 2 +- Source/cmSourceGroupCommand.cxx| 14 +++-- Tests/FindPostgreSQL/Test/main.c | 15 -- .../SourceGroupTreeCMakeLists-check.cmake | 1 + .../VS10Project/SourceGroupTreeCMakeLists.cmake| 33 +++-- 15 files changed, 135 insertions(+), 50 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-242-g370fe1495b
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 370fe1495b4109430b2cb250dd3afd1ce9401cf6 (commit) via 32a483187a77532da55e67a2121ff29a39e4c421 (commit) via 3c0a317a1d111fb1012de45c39b81048f5a700d9 (commit) via 0ec60a400234624b258307a7944184828c8b6abc (commit) via 408a3a7d5e21d6b49af5d9b3b7e59f3286cd32b7 (commit) via 602189bb7b5f62a28e101cf0ed51572d2bf92f2f (commit) via 2d83709038a40fd15abba23812150e78da963960 (commit) via 82ddcf0db1d220564145122c3cce25d25ee0e254 (commit) from cb165b8b79c96a3ff6db12cb1821cfa2c0c4cce5 (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=370fe1495b4109430b2cb250dd3afd1ce9401cf6 commit 370fe1495b4109430b2cb250dd3afd1ce9401cf6 Merge: 32a483187a 82ddcf0db1 Author: Brad King AuthorDate: Tue Nov 5 16:32:47 2019 + Commit: Kitware Robot CommitDate: Tue Nov 5 11:32:58 2019 -0500 Merge topic 'remove_sh_error_mingw' 82ddcf0db1 MinGW Makefiles: do not fail if sh.exe is present in the path Acked-by: Kitware Robot Merge-request: !3978 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32a483187a77532da55e67a2121ff29a39e4c421 commit 32a483187a77532da55e67a2121ff29a39e4c421 Merge: cb165b8b79 3c0a317a1d Author: Brad King AuthorDate: Tue Nov 5 11:32:00 2019 -0500 Commit: Brad King CommitDate: Tue Nov 5 11:32:00 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82ddcf0db1d220564145122c3cce25d25ee0e254 commit 82ddcf0db1d220564145122c3cce25d25ee0e254 Author: Johnny Jazeix AuthorDate: Sat Nov 2 11:25:01 2019 +0100 Commit: Brad King CommitDate: Mon Nov 4 12:03:48 2019 -0500 MinGW Makefiles: do not fail if sh.exe is present in the path The check was added only to fail early in an environment known not to work at the time: * https://web.archive.org/web/20120912010035/http://lists.trolltech.com/qt-interest/2006-01/thread00091-0.html Fixes: #19327 diff --git a/Help/release/dev/mingw_no_sh.rst b/Help/release/dev/mingw_no_sh.rst new file mode 100644 index 00..700886585b --- /dev/null +++ b/Help/release/dev/mingw_no_sh.rst @@ -0,0 +1,5 @@ +mingw-no-sh +--- + +* The :generator:`MinGW Makefiles` generator no longer issues an error if + ``sh.exe`` is present in the environment's ``PATH``. diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake index 523f00c3a3..f026e9aa7c 100644 --- a/Modules/CMakeMinGWFindMake.cmake +++ b/Modules/CMakeMinGWFindMake.cmake @@ -7,10 +7,5 @@ find_program(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS c:/MinGW/bin /MinGW/bin "[HKEY_CURRENT_USER\\Software\\CodeBlocks;Path]/MinGW/bin" ) -find_program(CMAKE_SH sh.exe ) -if(CMAKE_SH) - message(FATAL_ERROR "sh.exe was found in your PATH, here:\n${CMAKE_SH}\nFor MinGW make to work correctly sh.exe must NOT be in your path.\nRun cmake from a shell that does not have sh.exe in your PATH.\nIf you want to use a UNIX shell, then use MSYS Makefiles.\n") - set(CMAKE_MAKE_PROGRAM NOTFOUND) -endif() -mark_as_advanced(CMAKE_MAKE_PROGRAM CMAKE_SH) +mark_as_advanced(CMAKE_MAKE_PROGRAM) --- Summary of changes: Help/release/dev/mingw_no_sh.rst | 5 + Modules/CMakeMinGWFindMake.cmake | 7 +-- 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 Help/release/dev/mingw_no_sh.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-234-gcb165b8b79
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 cb165b8b79c96a3ff6db12cb1821cfa2c0c4cce5 (commit) via a269c77edb7c9d55efa1fbac46ed84173a7dcbc9 (commit) via 13ea5f06fad9bd9645cf4fb768e476dd7a053dd1 (commit) via 3521e3d524447f0f3ac20f8e2df2435dd6de7aa2 (commit) via 153226a1471d38ecf54b807a0d6cfa30c436166a (commit) via 2e9feddf68a15e9f8909aedbd8b0f3e916273b94 (commit) via 53cd86ea7846b55b7cb21886ea77482e626bbeb4 (commit) via e992d62b7e15be28c8d560071bcf847f28d9fbb1 (commit) via 3c0ca5a9d9d538da41e99207da22f55496bdf553 (commit) via e331367a898c6e0afa386c52fc7bd4d84d75ec29 (commit) from 20fdf9a92b2c46937353a53949636131d3664fc7 (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=cb165b8b79c96a3ff6db12cb1821cfa2c0c4cce5 commit cb165b8b79c96a3ff6db12cb1821cfa2c0c4cce5 Merge: a269c77edb 3c0ca5a9d9 Author: Brad King AuthorDate: Tue Nov 5 16:30:05 2019 + Commit: Kitware Robot CommitDate: Tue Nov 5 11:30:27 2019 -0500 Merge topic 'source_group-tree' 3c0ca5a9d9 source_group: ensure that passed file is not a directory Acked-by: Kitware Robot Merge-request: !3979 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a269c77edb7c9d55efa1fbac46ed84173a7dcbc9 commit a269c77edb7c9d55efa1fbac46ed84173a7dcbc9 Merge: 13ea5f06fa 53cd86ea78 Author: Brad King AuthorDate: Tue Nov 5 16:29:30 2019 + Commit: Kitware Robot CommitDate: Tue Nov 5 11:29:39 2019 -0500 Merge topic 'clarify_compile_features_documentation' 53cd86ea78 Help: Clarify what 'aware' means as it relates to C++ standards Acked-by: Kitware Robot Merge-request: !3988 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13ea5f06fad9bd9645cf4fb768e476dd7a053dd1 commit 13ea5f06fad9bd9645cf4fb768e476dd7a053dd1 Merge: 3521e3d524 e331367a89 Author: Brad King AuthorDate: Tue Nov 5 16:24:10 2019 + Commit: Kitware Robot CommitDate: Tue Nov 5 11:24:55 2019 -0500 Merge topic 'objc-pch' e331367a89 PCH: Add support for OBJC/OBJCXX languages Acked-by: Kitware Robot Merge-request: !3983 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3521e3d524447f0f3ac20f8e2df2435dd6de7aa2 commit 3521e3d524447f0f3ac20f8e2df2435dd6de7aa2 Merge: 153226a147 e992d62b7e Author: Brad King AuthorDate: Tue Nov 5 16:23:39 2019 + Commit: Kitware Robot CommitDate: Tue Nov 5 11:23:59 2019 -0500 Merge topic 'findpostgres-10-and-older' e992d62b7e FindPostgreSQL: support version encoding used in pre-10 releases Acked-by: Kitware Robot Merge-request: !3993 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=153226a1471d38ecf54b807a0d6cfa30c436166a commit 153226a1471d38ecf54b807a0d6cfa30c436166a Merge: 20fdf9a92b 2e9feddf68 Author: Brad King AuthorDate: Tue Nov 5 16:22:42 2019 + Commit: Kitware Robot CommitDate: Tue Nov 5 11:23:04 2019 -0500 Merge topic 'FindCUDA-find-nvcc' 2e9feddf68 FindCUDA: Use find_program instead of find_path when searching for nvcc. Acked-by: Kitware Robot Merge-request: !3990 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e9feddf68a15e9f8909aedbd8b0f3e916273b94 commit 2e9feddf68a15e9f8909aedbd8b0f3e916273b94 Author: Hong Xu AuthorDate: Mon Nov 4 11:18:05 2019 -0800 Commit: Hong Xu CommitDate: Mon Nov 4 14:17:20 2019 -0800 FindCUDA: Use find_program instead of find_path when searching for nvcc. Before this commit, nvcc would not be found if it is in env PATH but a non-standard location. This commit fixes this issue. diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index b6859aaf41..85d705c8d6 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -676,7 +676,7 @@ endif() # Search for the cuda distribution. if(NOT CUDA_TOOLKIT_ROOT_DIR AND NOT CMAKE_CROSSCOMPILING) # Search in the CUDA_BIN_PATH first. - find_path(CUDA_TOOLKIT_ROOT_DIR + find_program(CUDA_TOOLKIT_ROOT_DIR_NVCC NAMES nvcc nvcc.exe PATHS ENV CUDA_TOOLKIT_ROOT @@ -688,19 +688,22 @@ if(NOT CUDA_TOOLKIT_ROOT_DIR AND NOT CMAKE_CROSSCOMPILING) ) # Now search default paths - find_path(CUDA_TOOLKIT_ROOT_DIR + find_program(CUDA_TOOLKIT_ROOT_DIR_NVCC NAMES nvcc nvcc.exe PATHS /opt/cuda/bin PATH_SUFFIXES cuda/bin DOC "Toolkit location." ) - if (CUDA_TOOLKIT_ROOT_DIR) + if (CUDA_TOOLKIT_ROOT_DIR_NVCC) +get_filename_component(CUDA_TOOLKIT_ROOT_DIR_NVCC_PAR "${CUDA_TOOLKIT_
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-224-g20fdf9a92b
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 20fdf9a92b2c46937353a53949636131d3664fc7 (commit) via dd05ef429ab9f2d0377efba7a2bca1bb7181dc2f (commit) via ac8de0dbcfdefa431e4a32c4fd469cb5ac83af36 (commit) from 57db062414d0ae711a6e66c9eef69eabaa8fee6f (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=20fdf9a92b2c46937353a53949636131d3664fc7 commit 20fdf9a92b2c46937353a53949636131d3664fc7 Merge: 57db062414 dd05ef429a Author: Brad King AuthorDate: Tue Nov 5 16:21:16 2019 + Commit: Kitware Robot CommitDate: Tue Nov 5 11:21:25 2019 -0500 Merge topic 'docs-INSTALL_REMOVE_ENVIRONMENT_PATH' dd05ef429a Help: Fix inaccuracies in INSTALL_REMOVE_ENVIRONMENT_RPATH docs ac8de0dbcf RPATH: Remove stray indent in generated file(RPATH_CHANGE) command Acked-by: Kitware Robot Merge-request: !3985 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd05ef429ab9f2d0377efba7a2bca1bb7181dc2f commit dd05ef429ab9f2d0377efba7a2bca1bb7181dc2f Author: Craig Scott AuthorDate: Mon Nov 4 17:02:57 2019 +1100 Commit: Craig Scott CommitDate: Mon Nov 4 17:02:57 2019 +1100 Help: Fix inaccuracies in INSTALL_REMOVE_ENVIRONMENT_RPATH docs The previous docs assumed one had to set INSTALL_RPATH for this target property to have an effect, but the actual condition is only that the install rpath is different to the build rpath. Even if the install rpath is empty, it is possible that CMake will rewrite the rpath during install because the build rpath could be non-empty. diff --git a/Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst b/Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst index a474fc6712..72dcaa0b1f 100644 --- a/Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst +++ b/Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst @@ -1,10 +1,16 @@ INSTALL_REMOVE_ENVIRONMENT_RPATH -Removes compiler defined rpaths durimg installation. +Controls whether toolchain-defined rpaths should be removed during installation. -``INSTALL_REMOVE_ENVIRONMENT_RPATH`` is a boolean that if set to ``True`` will -remove compiler defined rpaths from the project if the user also defines rpath -with :prop_tgt:`INSTALL_RPATH`. This property is initialized by whether the -value of :variable:`CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH` is set when a -target is created. +When a target is being installed, CMake may need to rewrite its rpath +information. This occurs when the install rpath (as specified by the +:prop_tgt:`INSTALL_RPATH` target property) has different contents to the rpath +that the target was built with. Some toolchains insert their own rpath +contents into the binary as part of the build. By default, CMake will +preserve those extra inserted contents in the install rpath. For those +scenarios where such toolchain-inserted entries need to be discarded during +install, set the ``INSTALL_REMOVE_ENVIRONMENT_RPATH`` target property to true. + +This property is initialized by the value of +:variable:`CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH` when the target is created. diff --git a/Help/variable/CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst b/Help/variable/CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst index 19ae5f3c8b..76ca3da022 100644 --- a/Help/variable/CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst +++ b/Help/variable/CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst @@ -1,9 +1,9 @@ CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH -- -Removes compiler defined rpaths durimg installation. +Sets the default for whether toolchain-defined rpaths should be removed during +installation. -``CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH`` is a boolean that if set to ``true`` -removes compiler defined rpaths from the project if the user also defines rpath -with :prop_tgt:`INSTALL_RPATH`. This is used to initialize the target property -:prop_tgt:`INSTALL_REMOVE_ENVIRONMENT_RPATH` for all targets. +``CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH`` is a boolean that provides the +default value for the :prop_tgt:`INSTALL_REMOVE_ENVIRONMENT_RPATH` property +of all subsequently created targets. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac8de0dbcfdefa431e4a32c4fd469cb5ac83af36 commit ac8de0dbcfdefa431e4a32c4fd469cb5ac83af36 Author: Craig Scott AuthorDate: Mon Nov 4 16:26:42 2019 +1100 Commit: Craig Scott CommitDate: Mon Nov 4 16:26:42 2019 +1100 RPATH: Remove stray indent in generated file(RPATH_CHANGE) command diff --git a/Source/cmInstallTargetGenerator.cxx
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-221-g57db062414
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 57db062414d0ae711a6e66c9eef69eabaa8fee6f (commit) via 30e79bb4a388b59c5851b949a0dd559bc57e8ad3 (commit) from b089396f8e60c7a4a9e5fbece8484e7e77fd503a (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=57db062414d0ae711a6e66c9eef69eabaa8fee6f commit 57db062414d0ae711a6e66c9eef69eabaa8fee6f Merge: b089396f8e 30e79bb4a3 Author: Brad King AuthorDate: Tue Nov 5 15:55:31 2019 + Commit: Kitware Robot CommitDate: Tue Nov 5 10:55:41 2019 -0500 Merge topic 'ctest-repeat-until-pass' 30e79bb4a3 Tests: Extend RunCMake.CTestCommandLine internal timeout for valgrind Acked-by: Kitware Robot Merge-request: !3987 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30e79bb4a388b59c5851b949a0dd559bc57e8ad3 commit 30e79bb4a388b59c5851b949a0dd559bc57e8ad3 Author: Brad King AuthorDate: Mon Nov 4 11:21:38 2019 -0500 Commit: Brad King CommitDate: Mon Nov 4 11:22:58 2019 -0500 Tests: Extend RunCMake.CTestCommandLine internal timeout for valgrind A case added by commit 39ac8b4eb5 (ctest: Add --repeat-after-timeout option, 2019-10-29) includes a success-case timeout of 2 seconds. That is too short when running under valgrind, so extend it to 5 seconds. diff --git a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-cmake.cmake b/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-cmake.cmake index 4dc9c3648f..873c0bd6fb 100644 --- a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-cmake.cmake +++ b/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-cmake.cmake @@ -9,7 +9,7 @@ add_test(NAME test1 COMMAND ${CMAKE_COMMAND} "-DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}" -P "${CMAKE_CURRENT_SOURCE_DIR}/test1-timeout.cmake") -set_tests_properties(test1 PROPERTIES DEPENDS "initialization" TIMEOUT 2) +set_tests_properties(test1 PROPERTIES DEPENDS "initialization" TIMEOUT 5) add_test(hello ${CMAKE_COMMAND} -E echo hello) add_test(goodbye ${CMAKE_COMMAND} -E echo goodbye) --- Summary of changes: Tests/RunCMake/CTestCommandLine/repeat-after-timeout-cmake.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-219-gb089396f8e
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 b089396f8e60c7a4a9e5fbece8484e7e77fd503a (commit) via c831e409a53a33c3b3bdbaa9c19be5ae3364e1f6 (commit) from abb011935013f11048b1fe47b7496ba89c906984 (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=b089396f8e60c7a4a9e5fbece8484e7e77fd503a commit b089396f8e60c7a4a9e5fbece8484e7e77fd503a Merge: abb0119350 c831e409a5 Author: Craig Scott AuthorDate: Tue Nov 5 23:20:14 2019 +1100 Commit: Craig Scott CommitDate: Tue Nov 5 23:20:14 2019 +1100 Merge branch 'release-3.16' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-18-gc831e409a5
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, release has been updated via c831e409a53a33c3b3bdbaa9c19be5ae3364e1f6 (commit) via 55df3954d33913727fa7a5871ea1f336b1cbe85c (commit) from e123cfec099ee0c225a49fd698a9802305b86e1c (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 - --- Summary of changes: Help/command/find_package.rst | 4 ++- Help/manual/cmake-variables.7.rst | 1 + Help/release/3.16.rst | 4 ++- ...AKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY.rst | 15 +-- .../CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH.rst | 1 + Help/variable/CMAKE_FIND_USE_CMAKE_PATH.rst| 1 + Help/variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH.rst | 1 + Help/variable/CMAKE_FIND_USE_PACKAGE_REGISTRY.rst | 1 + Help/variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH.rst | 1 + .../CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH.rst | 3 ++- .../CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY.rst | 31 ++ Source/cmFindPackageCommand.cxx| 8 +- 12 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 Help/variable/CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-217-gabb0119350
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 abb011935013f11048b1fe47b7496ba89c906984 (commit) via 55df3954d33913727fa7a5871ea1f336b1cbe85c (commit) from 003e1f992e6e0dc32a0778f2bec604843cf180b4 (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=abb011935013f11048b1fe47b7496ba89c906984 commit abb011935013f11048b1fe47b7496ba89c906984 Merge: 003e1f992e 55df3954d3 Author: Craig Scott AuthorDate: Tue Nov 5 12:17:03 2019 + Commit: Kitware Robot CommitDate: Tue Nov 5 07:17:17 2019 -0500 Merge topic 'add_CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY' 55df3954d3 find_package: Add support for CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY Acked-by: Kitware Robot Merge-request: !3968 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55df3954d33913727fa7a5871ea1f336b1cbe85c commit 55df3954d33913727fa7a5871ea1f336b1cbe85c Author: Robert Maynard AuthorDate: Thu Oct 31 09:16:33 2019 -0400 Commit: Brad King CommitDate: Mon Nov 4 10:31:16 2019 -0500 find_package: Add support for CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY Extend the change from commit 1d00ba9ccf (Find: find_package prefers variable CMAKE_FIND_USE_REGISTRY, 2018-11-13, v3.16.0-rc1~461^2~1) to cover the system package registry too. Fixes: #19890 diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 546b00ff8e..64a16f3211 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -353,8 +353,10 @@ enabled. 8. Search paths stored in the CMake :ref:`System Package Registry`. This can be skipped if ``NO_CMAKE_SYSTEM_PACKAGE_REGISTRY`` is passed - or by setting the + or by setting the :variable:`CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY` + variable to ``FALSE`` or the deprecated variable :variable:`CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY` to ``TRUE``. + See the :manual:`cmake-packages(7)` manual for details on the system package registry. diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 0442d8930d..360140c41a 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -191,6 +191,7 @@ Variables that Change Behavior /variable/CMAKE_FIND_USE_PACKAGE_REGISTRY /variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH /variable/CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH + /variable/CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY /variable/CMAKE_FRAMEWORK_PATH /variable/CMAKE_IGNORE_PATH /variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE diff --git a/Help/release/3.16.rst b/Help/release/3.16.rst index 570f536cdc..3f198ca025 100644 --- a/Help/release/3.16.rst +++ b/Help/release/3.16.rst @@ -95,7 +95,9 @@ Commands * The :command:`find_package` command has learned to check the :variable:`CMAKE_FIND_USE_PACKAGE_REGISTRY` variable to control the default - behavior of searching the CMake user package registry. + behavior of searching the CMake user package registry and to check the + :variable:`CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY` variable to control + the default behavior of searching the CMake system package registry. * The :command:`message` command learned indentation control with the new :variable:`CMAKE_MESSAGE_INDENT` variable. diff --git a/Help/variable/CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY.rst b/Help/variable/CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY.rst index 44588b17ab..107c183eb8 100644 --- a/Help/variable/CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY.rst +++ b/Help/variable/CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY.rst @@ -1,12 +1,23 @@ CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY - -Skip :ref:`System Package Registry` in :command:`find_package` calls. +.. deprecated:: 3.16 + + Use the :variable:`CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY` variable instead. + +By default this variable is not set. If neither +:variable:`CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY` nor +``CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY`` is set, then +:command:`find_package()` will use the :ref:`System Package Registry` +unless the ``NO_CMAKE_SYSTEM_PACKAGE_REGISTRY`` option is provided. + +``CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY`` is ignored if +:variable:`CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY` is set. In some cases, it is not desirable to use the :ref:`System Package Registry` when searching for packages. If the :variable:`CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY` variable is -enabled, all the :command:`find_package` commands will skip +``T
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-215-g003e1f992e
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 003e1f992e6e0dc32a0778f2bec604843cf180b4 (commit) from 2654a2e999c1271c6730c1fb7d4582a3fff47ee8 (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=003e1f992e6e0dc32a0778f2bec604843cf180b4 commit 003e1f992e6e0dc32a0778f2bec604843cf180b4 Author: Kitware Robot AuthorDate: Tue Nov 5 00:01:08 2019 -0500 Commit: Kitware Robot CommitDate: Tue Nov 5 00:01:08 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ad42756770..7425c0fcdc 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191104) +set(CMake_VERSION_PATCH 20191105) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-214-g2654a2e999
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 2654a2e999c1271c6730c1fb7d4582a3fff47ee8 (commit) via f4eebeb447e628aac3d1f79b780bc309e2ad5904 (commit) from 96679969230112d52b6061d6d7523c7c24893255 (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=2654a2e999c1271c6730c1fb7d4582a3fff47ee8 commit 2654a2e999c1271c6730c1fb7d4582a3fff47ee8 Merge: 9667996923 f4eebeb447 Author: Brad King AuthorDate: Mon Nov 4 19:53:38 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 14:53:45 2019 -0500 Merge topic 'FindCUDA-find-nvcc' f4eebeb447 FindCUDA: Revert "Use find_program instead of find_path to find nvcc" Acked-by: Kitware Robot Merge-request: !3991 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4eebeb447e628aac3d1f79b780bc309e2ad5904 commit f4eebeb447e628aac3d1f79b780bc309e2ad5904 Author: Brad King AuthorDate: Mon Nov 4 14:49:53 2019 -0500 Commit: Brad King CommitDate: Mon Nov 4 14:50:04 2019 -0500 FindCUDA: Revert "Use find_program instead of find_path to find nvcc" Revert commit 067ee518f7 (FindCUDA: Use find_program instead of find_path to find nvcc, 2019-10-31). It causes `CUDA_TOOLKIT_ROOT_DIR` to contain the path to nvcc rather than the toolkit directory. diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 79d7fda653..b6859aaf41 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -676,7 +676,7 @@ endif() # Search for the cuda distribution. if(NOT CUDA_TOOLKIT_ROOT_DIR AND NOT CMAKE_CROSSCOMPILING) # Search in the CUDA_BIN_PATH first. - find_program(CUDA_TOOLKIT_ROOT_DIR + find_path(CUDA_TOOLKIT_ROOT_DIR NAMES nvcc nvcc.exe PATHS ENV CUDA_TOOLKIT_ROOT @@ -688,7 +688,7 @@ if(NOT CUDA_TOOLKIT_ROOT_DIR AND NOT CMAKE_CROSSCOMPILING) ) # Now search default paths - find_program(CUDA_TOOLKIT_ROOT_DIR + find_path(CUDA_TOOLKIT_ROOT_DIR NAMES nvcc nvcc.exe PATHS /opt/cuda/bin PATH_SUFFIXES cuda/bin --- Summary of changes: Modules/FindCUDA.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-212-g9667996923
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 96679969230112d52b6061d6d7523c7c24893255 (commit) via 7b2dd9dedc8195d2b3bc493dd5ab48cdd2fc3a7b (commit) via 949a1e120a3c2d9ecac08f7240a27d307fad503f (commit) from dbd14ecacf9b85dcdf5f566538167261dba224fe (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=96679969230112d52b6061d6d7523c7c24893255 commit 96679969230112d52b6061d6d7523c7c24893255 Merge: dbd14ecacf 7b2dd9dedc Author: Craig Scott AuthorDate: Mon Nov 4 19:11:32 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 14:11:45 2019 -0500 Merge topic 'message-check-types' 7b2dd9dedc Refactor: Use added message types in various modules 949a1e120a message: New message types to mark checks performed by CMake Acked-by: Kitware Robot Merge-request: !3689 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b2dd9dedc8195d2b3bc493dd5ab48cdd2fc3a7b commit 7b2dd9dedc8195d2b3bc493dd5ab48cdd2fc3a7b Author: Alex Turbov AuthorDate: Tue Aug 13 05:02:14 2019 +0300 Commit: Alex Turbov CommitDate: Sat Nov 2 14:10:09 2019 +0200 Refactor: Use added message types in various modules Co-Authored-By: Craig Scott diff --git a/Modules/CMakeDetermineCompileFeatures.cmake b/Modules/CMakeDetermineCompileFeatures.cmake index 01a81a1a86..6adebaef6d 100644 --- a/Modules/CMakeDetermineCompileFeatures.cmake +++ b/Modules/CMakeDetermineCompileFeatures.cmake @@ -5,7 +5,7 @@ function(cmake_determine_compile_features lang) if(lang STREQUAL C AND COMMAND cmake_record_c_compile_features) -message(STATUS "Detecting ${lang} compile features") +message(CHECK_START "Detecting ${lang} compile features") set(CMAKE_C90_COMPILE_FEATURES) set(CMAKE_C99_COMPILE_FEATURES) @@ -16,7 +16,7 @@ function(cmake_determine_compile_features lang) cmake_record_c_compile_features() if(NOT _result EQUAL 0) - message(STATUS "Detecting ${lang} compile features - failed") + message(CHECK_FAIL "failed") return() endif() @@ -40,10 +40,10 @@ function(cmake_determine_compile_features lang) set(CMAKE_C99_COMPILE_FEATURES ${CMAKE_C99_COMPILE_FEATURES} PARENT_SCOPE) set(CMAKE_C11_COMPILE_FEATURES ${CMAKE_C11_COMPILE_FEATURES} PARENT_SCOPE) -message(STATUS "Detecting ${lang} compile features - done") +message(CHECK_PASS "done") elseif(lang STREQUAL CXX AND COMMAND cmake_record_cxx_compile_features) -message(STATUS "Detecting ${lang} compile features") +message(CHECK_START "Detecting ${lang} compile features") set(CMAKE_CXX98_COMPILE_FEATURES) set(CMAKE_CXX11_COMPILE_FEATURES) @@ -56,7 +56,7 @@ function(cmake_determine_compile_features lang) cmake_record_cxx_compile_features() if(NOT _result EQUAL 0) - message(STATUS "Detecting ${lang} compile features - failed") + message(CHECK_FAIL "failed") return() endif() @@ -90,7 +90,7 @@ function(cmake_determine_compile_features lang) set(CMAKE_CXX17_COMPILE_FEATURES ${CMAKE_CXX17_COMPILE_FEATURES} PARENT_SCOPE) set(CMAKE_CXX20_COMPILE_FEATURES ${CMAKE_CXX20_COMPILE_FEATURES} PARENT_SCOPE) -message(STATUS "Detecting ${lang} compile features - done") +message(CHECK_PASS "done") endif() endfunction() diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake index 06f3ba22de..c5611b5be4 100644 --- a/Modules/CMakeDetermineCompilerABI.cmake +++ b/Modules/CMakeDetermineCompilerABI.cmake @@ -12,7 +12,7 @@ include(CMakeTestCompilerCommon) function(CMAKE_DETERMINE_COMPILER_ABI lang src) if(NOT DEFINED CMAKE_${lang}_ABI_COMPILED) -message(STATUS "Detecting ${lang} compiler ABI info") +message(CHECK_START "Detecting ${lang} compiler ABI info") # Compile the ABI identification source. set(BIN "${CMAKE_PLATFORM_INFO_DIR}/CMakeDetermineCompilerABI_${lang}.bin") @@ -66,7 +66,7 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src) # Load the resulting information strings. if(CMAKE_${lang}_ABI_COMPILED AND NOT _copy_error) - message(STATUS "Detecting ${lang} compiler ABI info - done") + message(CHECK_PASS "done") file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Detecting ${lang} compiler ABI info compiled with the following output:\n${OUTPUT}\n\n") file(STRINGS "${BIN}
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-16-ge123cfec09
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, release has been updated via e123cfec099ee0c225a49fd698a9802305b86e1c (commit) via bd1f350883fe0c276b319873d38164b56689b8bb (commit) via 9decc17a232055ccd8510e9c92383d0f3299f424 (commit) via 721b99defc53e88a5c7ce295d075288f0566f719 (commit) via 94d669ecc7914bec49288a5a91efefc1f23eb2a0 (commit) via 9682adb6ad10b22297125f74d4919031f7ce227b (commit) via 0692eaf0fe00fd4bd90c2a4f107356b2bc0f9d99 (commit) via f805cdd2614b932d7a5b1b236f75ad11d59f349d (commit) via 657fb0aa6fadf0c3aa4f8a914feb621cdfb6af4f (commit) via b7955bd9311601906ef4cb919c2e8f38d977d3d9 (commit) from d0681fda117505b6508fa2c6e291237bbf7a0a83 (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 - --- Summary of changes: Help/command/load_cache.rst| 4 +- Help/guide/tutorial/index.rst | 129 +++-- Help/manual/cmake-compile-features.7.rst | 22 ++-- Modules/FindwxWidgets.cmake| 10 ++ Source/cmSystemTools.cxx | 9 +- Tests/RunCMake/message/RunCMakeTest.cmake | 9 ++ .../message/warnmessage-rootdir-stderr.txt | 1 + Tests/RunCMake/message/warnmessage-rootdir.cmake | 5 + 8 files changed, 111 insertions(+), 78 deletions(-) create mode 100644 Tests/RunCMake/message/warnmessage-rootdir-stderr.txt create mode 100644 Tests/RunCMake/message/warnmessage-rootdir.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-209-gdbd14ecacf
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 dbd14ecacf9b85dcdf5f566538167261dba224fe (commit) via 5c3c2285706cf03e11562b7573f7f75a059a963b (commit) via 70307b935193789624fc694b4e94175e902fdc2e (commit) via e123cfec099ee0c225a49fd698a9802305b86e1c (commit) via bd1f350883fe0c276b319873d38164b56689b8bb (commit) via 9decc17a232055ccd8510e9c92383d0f3299f424 (commit) via 721b99defc53e88a5c7ce295d075288f0566f719 (commit) via 94d669ecc7914bec49288a5a91efefc1f23eb2a0 (commit) via abac3a31a2caba00e56db917cebaae8e47ffeefd (commit) via b30701f04500b44810ec1413fe787a0c88a98c41 (commit) via accbaf5f733fb9046c0d16903021c25febc9bd97 (commit) via 0692eaf0fe00fd4bd90c2a4f107356b2bc0f9d99 (commit) via 63c0bc929240b0dd7253cced980fea0b735eb5c3 (commit) via f805cdd2614b932d7a5b1b236f75ad11d59f349d (commit) via b7955bd9311601906ef4cb919c2e8f38d977d3d9 (commit) via 687a354518c8f6d5d1864ef9cd5d823b92b305bb (commit) from 543ceb9d9e06647356328313b8d0ec0c4a171de3 (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=dbd14ecacf9b85dcdf5f566538167261dba224fe commit dbd14ecacf9b85dcdf5f566538167261dba224fe Merge: 5c3c228570 687a354518 Author: Brad King AuthorDate: Mon Nov 4 15:29:47 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 10:30:39 2019 -0500 Merge topic 'FindPython-customize-failure-message' 687a354518 FindPython: customize failure message Acked-by: Kitware Robot Merge-request: !3970 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c3c2285706cf03e11562b7573f7f75a059a963b commit 5c3c2285706cf03e11562b7573f7f75a059a963b Merge: 70307b9351 63c0bc9292 Author: Brad King AuthorDate: Mon Nov 4 15:29:36 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 10:29:44 2019 -0500 Merge topic 'cpack_absolute_package_directory' 63c0bc9292 CPack: Ensure CPACK_PACKAGE_DIRECTORY is an absolute path Acked-by: Kitware Robot Merge-request: !3946 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70307b935193789624fc694b4e94175e902fdc2e commit 70307b935193789624fc694b4e94175e902fdc2e Merge: abac3a31a2 e123cfec09 Author: Brad King AuthorDate: Mon Nov 4 10:28:14 2019 -0500 Commit: Brad King CommitDate: Mon Nov 4 10:28:14 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abac3a31a2caba00e56db917cebaae8e47ffeefd commit abac3a31a2caba00e56db917cebaae8e47ffeefd Merge: b30701f045 0692eaf0fe Author: Brad King AuthorDate: Mon Nov 4 15:24:05 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 10:24:31 2019 -0500 Merge topic 'root-dir-assertion-fix' 0692eaf0fe ForceToRelativePath: Fix spurious assertion when local path is root dir Acked-by: Kitware Robot Merge-request: !3976 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b30701f04500b44810ec1413fe787a0c88a98c41 commit b30701f04500b44810ec1413fe787a0c88a98c41 Merge: accbaf5f73 f805cdd261 Author: Brad King AuthorDate: Mon Nov 4 15:23:11 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 10:23:46 2019 -0500 Merge topic 'FindwxWidgets-wxwin-313' f805cdd261 FindwxWidgets: Add support for 3.1.3 VS binaries Acked-by: Kitware Robot Merge-request: !3972 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=accbaf5f733fb9046c0d16903021c25febc9bd97 commit accbaf5f733fb9046c0d16903021c25febc9bd97 Merge: 543ceb9d9e b7955bd931 Author: Brad King AuthorDate: Mon Nov 4 15:20:59 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 10:22:29 2019 -0500 Merge topic 'update-compile-feature-supported-compiler-list' b7955bd931 Help: Remove out of date bounds on compile feature supported versions Acked-by: Kitware Robot Merge-request: !3974 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63c0bc929240b0dd7253cced980fea0b735eb5c3 commit 63c0bc929240b0dd7253cced980fea0b735eb5c3 Author: Johnny Jazeix AuthorDate: Wed Oct 30 18:53:21 2019 +0100 Commit: Brad King CommitDate: Fri Nov 1 10:18:33 2019 -0400 CPack: Ensure CPACK_PACKAGE_DIRECTORY is an absolute path Fixes: #18133, #19412 diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 58956522f4..d7868f3465 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -314,7 +314,7 @@ int main(int argc, char const* const* argv) else { // get a default value (current working directory) cpackProjectDirecto
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-193-g543ceb9d9e
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 543ceb9d9e06647356328313b8d0ec0c4a171de3 (commit) via 6416753f32075c9d6b6aaf84f55ab21eccc0ba93 (commit) via cae17f7208de2d460d7d70d3fc6624ad6a84bb11 (commit) via 1463cfb437768c5f330f2c5aa73deaecfc0d50e0 (commit) via 9682adb6ad10b22297125f74d4919031f7ce227b (commit) via 657fb0aa6fadf0c3aa4f8a914feb621cdfb6af4f (commit) via 067ee518f792b2babc9ae53c69bddeb5e15f3d76 (commit) via 59673bb2dc4a1336dd9028573ed33d934087f8ee (commit) via 210d04bb79b961252c3685b1d7a3653beec39fe6 (commit) from e3afdef8c567880d7c83ca5980e4c5f5d289880c (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=543ceb9d9e06647356328313b8d0ec0c4a171de3 commit 543ceb9d9e06647356328313b8d0ec0c4a171de3 Merge: 6416753f32 657fb0aa6f Author: Brad King AuthorDate: Mon Nov 4 15:20:48 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 10:21:27 2019 -0500 Merge topic 'fix_load_cache_docs' 657fb0aa6f Help: Clarify load_cache documentation of first parameter Acked-by: Kitware Robot Merge-request: !3971 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6416753f32075c9d6b6aaf84f55ab21eccc0ba93 commit 6416753f32075c9d6b6aaf84f55ab21eccc0ba93 Merge: cae17f7208 9682adb6ad Author: Brad King AuthorDate: Mon Nov 4 15:20:26 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 10:20:34 2019 -0500 Merge topic 'tutorial-cleanup' 9682adb6ad Tutorial: clean up typos, grammar and formatting Acked-by: Kitware Robot Merge-request: !3984 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cae17f7208de2d460d7d70d3fc6624ad6a84bb11 commit cae17f7208de2d460d7d70d3fc6624ad6a84bb11 Merge: 1463cfb437 067ee518f7 Author: Brad King AuthorDate: Mon Nov 4 15:13:02 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 10:13:27 2019 -0500 Merge topic 'FindCUDA-find-nvcc' 067ee518f7 FindCUDA: Use find_program instead of find_path to find nvcc Acked-by: Kitware Robot Merge-request: !3973 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1463cfb437768c5f330f2c5aa73deaecfc0d50e0 commit 1463cfb437768c5f330f2c5aa73deaecfc0d50e0 Merge: e3afdef8c5 59673bb2dc Author: Brad King AuthorDate: Mon Nov 4 15:12:19 2019 + Commit: Kitware Robot CommitDate: Mon Nov 4 10:12:26 2019 -0500 Merge topic 'pgi-license-warnings' 59673bb2dc Tests: Teach RunCMake to ignore PGI license expiry warnings 210d04bb79 CTestCustom: Suppress PGI Community Edition compiler license warnings Acked-by: Kitware Robot Merge-request: !3975 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9682adb6ad10b22297125f74d4919031f7ce227b commit 9682adb6ad10b22297125f74d4919031f7ce227b Author: Craig Scott AuthorDate: Mon Nov 4 12:33:50 2019 +1100 Commit: Craig Scott CommitDate: Mon Nov 4 12:44:34 2019 +1100 Tutorial: clean up typos, grammar and formatting diff --git a/Help/guide/tutorial/index.rst b/Help/guide/tutorial/index.rst index d858c25f97..3f20aa26e5 100644 --- a/Help/guide/tutorial/index.rst +++ b/Help/guide/tutorial/index.rst @@ -18,9 +18,9 @@ A Basic Starting Point (Step 1) === The most basic project is an executable built from source code files. -For simple projects, a three line CMakeLists file is all that is required. -This will be the starting point for our tutorial. Create a ``CMakeLists.txt`` -file in the ``Step1`` directory that looks like: +For simple projects, a three line ``CMakeLists.txt`` file is all that is +required. This will be the starting point for our tutorial. Create a +``CMakeLists.txt`` file in the ``Step1`` directory that looks like: .. code-block:: cmake @@ -33,7 +33,7 @@ file in the ``Step1`` directory that looks like: add_executable(Tutorial tutorial.cxx) -Note that this example uses lower case commands in the CMakeLists file. +Note that this example uses lower case commands in the ``CMakeLists.txt`` file. Upper, lower, and mixed case commands are supported by CMake. The source code for ``tutorial.cxx`` is provided in the ``Step1`` directory and can be used to compute the square root of a number. @@ -43,9 +43,9 @@ Adding a Version Number and Configured Header File The first feature we will add is to provide our executable and project with a version number. While we could do this exclusively in the source code, using -CMakeLists provides more flexibility. +``CMakeLists.txt`` provides more flexibility. -First, modify the CMakeLists f
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-184-ge3afdef8c5
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 e3afdef8c567880d7c83ca5980e4c5f5d289880c (commit) from 402c06974648ac215945e0e9bf55e7d04f8e60a5 (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=e3afdef8c567880d7c83ca5980e4c5f5d289880c commit e3afdef8c567880d7c83ca5980e4c5f5d289880c Author: Kitware Robot AuthorDate: Mon Nov 4 00:01:09 2019 -0500 Commit: Kitware Robot CommitDate: Mon Nov 4 00:01:09 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3c4a4642de..ad42756770 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191103) +set(CMake_VERSION_PATCH 20191104) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-6-gd0681fda11
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, release has been updated via d0681fda117505b6508fa2c6e291237bbf7a0a83 (commit) via 2490c1df74000c340afeab55159aa362f268b10b (commit) via 23752d5bad631e7948796281f3c7548bbec80fd4 (commit) via ad024439f50f79f76b10b31f1c1a3e5f73f09462 (commit) from 91c26b3d387ffd4948ecde38ab2c5f894b7dbe8c (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 - --- Summary of changes: Help/command/file.rst | 20 ++-- Help/command/list.rst | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-183-g402c069746
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 402c06974648ac215945e0e9bf55e7d04f8e60a5 (commit) via d0681fda117505b6508fa2c6e291237bbf7a0a83 (commit) via 2490c1df74000c340afeab55159aa362f268b10b (commit) from 83badd91bff023b60c40a09a6761957ab50cfc90 (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=402c06974648ac215945e0e9bf55e7d04f8e60a5 commit 402c06974648ac215945e0e9bf55e7d04f8e60a5 Merge: 83badd91bf d0681fda11 Author: Craig Scott AuthorDate: Mon Nov 4 09:43:22 2019 +1100 Commit: Craig Scott CommitDate: Mon Nov 4 09:43:22 2019 +1100 Merge branch 'release-3.16' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-180-g83badd91bf
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 83badd91bff023b60c40a09a6761957ab50cfc90 (commit) via 3c8dab73cb01285da589b033b31b76623a74520c (commit) via 23752d5bad631e7948796281f3c7548bbec80fd4 (commit) via ad024439f50f79f76b10b31f1c1a3e5f73f09462 (commit) from 0fb4e0ad15540e782b4baa7117e8db30c8afe640 (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=83badd91bff023b60c40a09a6761957ab50cfc90 commit 83badd91bff023b60c40a09a6761957ab50cfc90 Merge: 3c8dab73cb 23752d5bad Author: Craig Scott AuthorDate: Sun Nov 3 22:40:23 2019 + Commit: Kitware Robot CommitDate: Sun Nov 3 17:40:32 2019 -0500 Merge topic 'docs-file-GET_RUNTIME_DEPENDENCIES' 23752d5bad Help: Typo and grammar fixes for file(GET_RUNTIME_DEPENDENCIES) Acked-by: Kitware Robot Merge-request: !3982 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c8dab73cb01285da589b033b31b76623a74520c commit 3c8dab73cb01285da589b033b31b76623a74520c Merge: 0fb4e0ad15 ad024439f5 Author: Craig Scott AuthorDate: Sun Nov 3 22:35:07 2019 + Commit: Kitware Robot CommitDate: Sun Nov 3 17:35:16 2019 -0500 Merge topic 'docs-list-remove_item' ad024439f5 Help: list(REMOVE_ITEM) removes all instances, not just the first found Acked-by: Kitware Robot Merge-request: !3977 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23752d5bad631e7948796281f3c7548bbec80fd4 commit 23752d5bad631e7948796281f3c7548bbec80fd4 Author: Craig Scott AuthorDate: Sun Nov 3 22:44:36 2019 +1100 Commit: Craig Scott CommitDate: Sun Nov 3 22:44:36 2019 +1100 Help: Typo and grammar fixes for file(GET_RUNTIME_DEPENDENCIES) Note that ``MODULE`` s was rendering strangely, so the wording has been tweaked to avoid needing to specify ``MODULE`` as a plural word. Modules are still libraries, so it is okay to call them as such where it doesn't cause any ambiguity. diff --git a/Help/command/file.rst b/Help/command/file.rst index 83e451636f..b186177eb6 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -187,14 +187,14 @@ The arguments are as follows: are typically created with :command:`add_executable`, but they do not have to be created by CMake. On Apple platforms, the paths to these files determine the value of ``@executable_path`` when recursively resolving the libraries. - Specifying ``STATIC`` libraries, ``MODULE`` s, or ``SHARED`` libraries here + Specifying any kind of library (``STATIC``, ``MODULE``, or ``SHARED``) here will result in undefined behavior. ``LIBRARIES `` List of library files to read for dependencies. These are libraries that are typically created with :command:`add_library(SHARED)`, but they do not have - to be created by CMake. Specifying ``STATIC`` libraries, ``MODULE`` s, or - executables here will result in undefined behavior. + to be created by CMake. Specifying ``STATIC`` libraries, ``MODULE`` + libraries, or executables here will result in undefined behavior. ``MODULES `` List of loadable module files to read for dependencies. These are modules @@ -209,13 +209,13 @@ The arguments are as follows: platforms, these directories are searched if the dependency is not found in any of the other usual paths. If it is found in such a directory, a warning is issued, because it means that the file is incomplete (it does not list all - of the directories that contain its dependencies.) On Windows platforms, + of the directories that contain its dependencies). On Windows platforms, these directories are searched if the dependency is not found in any of the other search paths, but no warning is issued, because searching other paths is a normal part of Windows dependency resolution. On Apple platforms, this argument has no effect. -``BUNDLE_EXECTUBLE `` +``BUNDLE_EXECUTABLE `` Executable to treat as the "bundle executable" when resolving libraries. On Apple platforms, this argument determines the value of ``@executable_path`` when recursively resolving libraries for ``LIBRARIES`` and ``MODULES`` files. @@ -284,7 +284,7 @@ On Linux platforms, library resolution works as follows: dependency is resolved to that file. In this case, a warning is issued, because finding a file in one of the ``DIRECTORIES`` means that the depending file is not complete (it does not list all the directories from - which it pulls dependencies.) + which it pulls dependencies). 5. Otherwise, the dependency is unresolved. On Windows platforms, libr
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-176-g0fb4e0ad15
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 0fb4e0ad15540e782b4baa7117e8db30c8afe640 (commit) from 60e7e5b60540dfbd1e67c415ee399e4aea59a369 (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=0fb4e0ad15540e782b4baa7117e8db30c8afe640 commit 0fb4e0ad15540e782b4baa7117e8db30c8afe640 Author: Kitware Robot AuthorDate: Sun Nov 3 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Sun Nov 3 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 17a23950bb..3c4a4642de 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191102) +set(CMake_VERSION_PATCH 20191103) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-175-g60e7e5b605
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 60e7e5b60540dfbd1e67c415ee399e4aea59a369 (commit) from 6660926f22b940759954e74e2b4c0c3dd0ff1991 (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=60e7e5b60540dfbd1e67c415ee399e4aea59a369 commit 60e7e5b60540dfbd1e67c415ee399e4aea59a369 Author: Kitware Robot AuthorDate: Sat Nov 2 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Sat Nov 2 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7bb9f90075..17a23950bb 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191101) +set(CMake_VERSION_PATCH 20191102) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-174-g6660926f22
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 6660926f22b940759954e74e2b4c0c3dd0ff1991 (commit) via 39ac8b4eb5c5ea99cf1053bd37e76d811f5122fc (commit) via 80c2c9d14cf1c1a8f162e119bd00d5f483a94af2 (commit) via 0187e522448c8fe92c15d4a983afac36950d1d59 (commit) from b42da462333aea986576d00bf9af7449aa6e8010 (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=6660926f22b940759954e74e2b4c0c3dd0ff1991 commit 6660926f22b940759954e74e2b4c0c3dd0ff1991 Merge: b42da46233 39ac8b4eb5 Author: Brad King AuthorDate: Fri Nov 1 13:55:09 2019 + Commit: Kitware Robot CommitDate: Fri Nov 1 09:55:18 2019 -0400 Merge topic 'ctest-repeat-until-pass' 39ac8b4eb5 ctest: Add --repeat-after-timeout option 80c2c9d14c ctest: Add --repeat-until-pass option 0187e52244 cmCTestRunTest: Use inline member initializers Acked-by: Kitware Robot Merge-request: !3960 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39ac8b4eb5c5ea99cf1053bd37e76d811f5122fc commit 39ac8b4eb5c5ea99cf1053bd37e76d811f5122fc Author: Brad King AuthorDate: Tue Oct 29 14:21:38 2019 -0400 Commit: Brad King CommitDate: Tue Oct 29 15:14:36 2019 -0400 ctest: Add --repeat-after-timeout option Add an option to re-run tests if they timeout. This will help tolerate sporadic timeouts on busy machines. diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 031b9a7636..0097cee148 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -268,9 +268,17 @@ Options ``--repeat-until-pass `` Allow each test to run up to times in order to pass. + Repeats tests if they fail for any reason. This is useful in tolerating sporadic failures in test cases. +``--repeat-after-timeout `` + Allow each test to run up to times in order to pass. + Repeats tests only if they timeout. + + This is useful in tolerating sporadic timeouts in test cases + on busy machines. + ``--max-width `` Set the max width for a test name to output. diff --git a/Help/release/dev/ctest-repeat-until-pass.rst b/Help/release/dev/ctest-repeat-until-pass.rst index 003cdf2aec..d177247181 100644 --- a/Help/release/dev/ctest-repeat-until-pass.rst +++ b/Help/release/dev/ctest-repeat-until-pass.rst @@ -1,5 +1,6 @@ ctest-repeat-until-pass --- -* The :manual:`ctest(1)` tool learned a new ``--repeat-until-pass `` - option to help tolerate sporadic test failures. +* The :manual:`ctest(1)` tool learned new ``--repeat-until-pass `` + and ``--repeat-after-timeout `` options to help tolerate sporadic + test failures. diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index ce9e13bbba..ba146532b6 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -345,7 +345,9 @@ bool cmCTestRunTest::NeedsToRerun() if ((this->RerunMode == cmCTest::Rerun::UntilFail && this->TestResult.Status == cmCTestTestHandler::COMPLETED) || (this->RerunMode == cmCTest::Rerun::UntilPass && - this->TestResult.Status != cmCTestTestHandler::COMPLETED)) { + this->TestResult.Status != cmCTestTestHandler::COMPLETED) || + (this->RerunMode == cmCTest::Rerun::AfterTimeout && + this->TestResult.Status == cmCTestTestHandler::TIMEOUT)) { this->RunAgain = true; return true; } @@ -745,10 +747,11 @@ void cmCTestRunTest::WriteLogOutputTop(size_t completed, size_t total) // then it will never print out the completed / total, same would // got for run until pass. Trick is when this is called we don't // yet know if we are passing or failing. - if ((this->RerunMode != cmCTest::Rerun::UntilPass && - this->NumberOfRunsLeft == 1) || - (this->RerunMode == cmCTest::Rerun::UntilPass && - this->NumberOfRunsLeft == this->NumberOfRunsTotal) || + bool const progressOnLast = +(this->RerunMode != cmCTest::Rerun::UntilPass && + this->RerunMode != cmCTest::Rerun::AfterTimeout); + if ((progressOnLast && this->NumberOfRunsLeft == 1) || + (!progressOnLast && this->NumberOfRunsLeft == this->NumberOfRunsTotal) || this->CTest->GetTestProgressOutput()) { outputStream << std::setw(getNumWidth(total)) << completed << "/"; outputStream << std::setw(getNumWidth(total)) << total << " "; diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 7276d98fba..20445b08
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-170-gb42da46233
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 b42da462333aea986576d00bf9af7449aa6e8010 (commit) from aeaa590cb206bce9407993baf0c90c8979d0af8c (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=b42da462333aea986576d00bf9af7449aa6e8010 commit b42da462333aea986576d00bf9af7449aa6e8010 Author: Kitware Robot AuthorDate: Fri Nov 1 00:01:08 2019 -0400 Commit: Kitware Robot CommitDate: Fri Nov 1 00:01:08 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 01dbbdf4e9..7bb9f90075 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191031) +set(CMake_VERSION_PATCH 20191101) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-169-gaeaa590cb2
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 aeaa590cb206bce9407993baf0c90c8979d0af8c (commit) via bd986ed36704f56e7b9fdac6ef8106587a9fd119 (commit) via 91c26b3d387ffd4948ecde38ab2c5f894b7dbe8c (commit) via cd888f1133d0c393816e0e740457e2de24de5c2a (commit) from 382607c9609f538b9fd5ec30c53aab3a93477f75 (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=aeaa590cb206bce9407993baf0c90c8979d0af8c commit aeaa590cb206bce9407993baf0c90c8979d0af8c Merge: bd986ed367 91c26b3d38 Author: Brad King AuthorDate: Thu Oct 31 13:45:53 2019 -0400 Commit: Brad King CommitDate: Thu Oct 31 13:45:53 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd986ed36704f56e7b9fdac6ef8106587a9fd119 commit bd986ed36704f56e7b9fdac6ef8106587a9fd119 Merge: 382607c960 cd888f1133 Author: Brad King AuthorDate: Thu Oct 31 17:45:15 2019 + Commit: Kitware Robot CommitDate: Thu Oct 31 13:45:22 2019 -0400 Merge topic 'clarify-BOOL-genex-eval' cd888f1133 Help: drop confusing reference to `if()` from `$` Acked-by: Kitware Robot Merge-request: !3969 --- Summary of changes: Help/manual/cmake-generator-expressions.7.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-2-g91c26b3d38
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, release has been updated via 91c26b3d387ffd4948ecde38ab2c5f894b7dbe8c (commit) via cd888f1133d0c393816e0e740457e2de24de5c2a (commit) from c1d5d5eb11e0260ffadda0851ac844ab46b6b179 (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 - --- Summary of changes: Help/manual/cmake-generator-expressions.7.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.16.0-rc3, created. v3.16.0-rc3
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 annotated tag, v3.16.0-rc3 has been created at d699a5b4cc862d6734b6c480d73f95fab9437939 (tag) tagging c1d5d5eb11e0260ffadda0851ac844ab46b6b179 (commit) replaces v3.16.0-rc2 tagged by Brad King on Thu Oct 31 10:27:12 2019 -0400 - Log - CMake 3.16.0-rc3 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl2670AWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhCkVD/0YsUv3Zi/CcjYy4vs3U8Rdb2UP uE/4UUeZc1h/0DHnOCxxpBzPNb6X4kgTJVIvBg1uP+q0dOKB5P3Q+HCwaCfYr5e6 iKFoCVvW8Y2oLrk50Hsku7fwP2yZWgF57FTN94+8WdPw2vmFl8OHfdl+AxUXjjWb FghEux/N4jKVacTvGUKySjL1/fYerjrAFSOUawde6c+OVHw6fqwRmmBrZbLVGueF WaFDkAkIChONHI144yfL4cYqsf/lDjfYgbw4u6sg4EKSy5aYqbkazgkZwMWZB2SL rEOzsQ1FfZYDaxjbPcgEoetEOR8zFUnJBtTLtKN/zB/YZpU4jDw3EFOf2Pp87qmz sPY1/YfMwpQtQ6PQTRSwE1YIvE6leqO3SBSj5kcaO/FsxdA2mYJBTOda1iKAfbcA g62/C/J7mRAjqrTnF7pJH4pNoD/9t8CIiReAqeOL/fbP6j2c7NN/I2VL+0aicKgu 1Smvwbh+IIgET+lAb6BxA3U8WA0bnCIqvXYSDoukhHuLAEYuM4xg0Qi/faT//LOX tdBbTLYASDPAJ2rWQwWzlHi8qUoT5Po2iy7UfERMEkSadtAAopoBrZ1Y2dt+EAaB SP4jkd1Z8gnfFcKr0FKNJ8C/ke26phUdYIGi0YlihCSPwmD8eCegwlKblHRoauyo BS/cTWjkFr6lgQ8NaA== =trsk -END PGP SIGNATURE- Alan W. Irwin (1): Help: Fix COMPILE_LANG_AND_ID genex example Brad King (17): Merge branch 'doc-genex-tweak' into release-3.16 Merge branch 'FindOpenMP-include-dir' into release-3.16 Merge branch 'ccmake-clear-help' into release-3.16 Merge branch 'cmp0097-doc-fix' into release-3.16 Merge branch 'framework-tests-multiarch-old-macos' into release-3.16 Merge branch 'docs-find-vars' into release-3.16 Merge branch 'swift-parallel-jobs' into release-3.16 Swift: Honor CMAKE_OSX_SYSROOT on Apple platforms Merge branch 'FindCurses-formw' into release-3.16 Merge branch 'sdk-on-mac' into release-3.16 bootstrap: Avoid redundant compiler selection checks Merge branch 'bootstrap-break' into release-3.16 Merge branch 'fix-find_package-doc' into release-3.16 Merge branch 'autogen_windows_search_fix' into release-3.16 Merge branch 'help-file-spelling-error' into release-3.16 Merge branch 'swift-rpath' into release-3.16 CMake 3.16.0-rc3 Craig Scott (12): FindOpenMP: Allow try_compile() to find omp.h for AppleClang Help: math() expressions must be representable as signed 64-bit project: Fix potential buffer write-past-end for version components Help: Document that _ROOT applies to config packages too Help: Fix markup errors, improve wording of CMAKE_FIND... variable docs Help: Minor wording cleanup for Python modules Tests: Prevent CMP0012 policy warnings in Framework test output Tests: Match file command output for older macOS (Framework test) Merge branch 'docs-FindPython-minor-grammar' into release-3.16 Merge branch 'project-version-buffer-overflow' into release-3.16 Help: Fix minor typo in CMakePrintHelpers module docs Merge branch 'docs-CMakePrintHelpers-typo' into release-3.16 Deniz Bahadir (1): Help: Add OPTIONAL_COMPONENTS to config mode signature of find_package. Kyle Edwards (1): Help: Fix capitalization in CMP0097 documentation Marc Chevrier (1): Help: Fix spelling error in file(GET_RUNTIME_DEPENDENCIES) docs Saleem Abdulrasool (2): Swift: correct flags for parallel jobs Swift: support `BUILD_RPATH` properties Sebastian Holtermann (1): Autogen: Fix ambiguity in header file detection on Windows Sylvain Joubert (1): ccmake: Fully clear the 1st help line when processing nick black (1): FindCurses: use formw when wide support is requested --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-203-g382607c960
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 382607c9609f538b9fd5ec30c53aab3a93477f75 (commit) via c1d5d5eb11e0260ffadda0851ac844ab46b6b179 (commit) from a9d02dab77f697d03b252e188e13a33c66edbca7 (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=382607c9609f538b9fd5ec30c53aab3a93477f75 commit 382607c9609f538b9fd5ec30c53aab3a93477f75 Merge: a9d02dab77 c1d5d5eb11 Author: Brad King AuthorDate: Thu Oct 31 10:36:15 2019 -0400 Commit: Brad King CommitDate: Thu Oct 31 10:36:15 2019 -0400 Merge branch 'release-3.16' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc2-38-gc1d5d5eb11
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, release has been updated via c1d5d5eb11e0260ffadda0851ac844ab46b6b179 (commit) from a53921b016e05693e5f64a8d452c689a9aa4279f (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 - --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc2-37-ga53921b016
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, release has been updated via a53921b016e05693e5f64a8d452c689a9aa4279f (commit) via d3c8610556fa5d22182142b7306542703c8f5a9f (commit) via 7fa657b41d1b08bb5be3f16ced37ecb07a32e748 (commit) via 1e05f89f4b77f3610122b54d272a41966bf24a72 (commit) via e0412a0e0b9eb650d41be3e730ca19e2ae9c5422 (commit) via 90d643c31221a1b1e3841a0a1f7a2b2f8d16d2d8 (commit) from e5cc8f575b81fa3af001d69b0737269f04cf94b2 (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 - --- Summary of changes: Help/command/file.rst | 2 +- Modules/CMakeSwiftInformation.cmake | 4 Source/cmQtAutoMocUic.cxx | 8 +++- 3 files changed, 8 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-201-ga9d02dab77
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 a9d02dab77f697d03b252e188e13a33c66edbca7 (commit) via abd223cf05ac033e6c79b2487059009fbab0eef0 (commit) via e5b90743e6bb169bd4bd6b1b8672f3cf3091d6e8 (commit) via 6f15cea15ef510274fb062742744f23550260d01 (commit) via a53921b016e05693e5f64a8d452c689a9aa4279f (commit) via d3c8610556fa5d22182142b7306542703c8f5a9f (commit) via 7fa657b41d1b08bb5be3f16ced37ecb07a32e748 (commit) via 1e05f89f4b77f3610122b54d272a41966bf24a72 (commit) via e0412a0e0b9eb650d41be3e730ca19e2ae9c5422 (commit) via 90d643c31221a1b1e3841a0a1f7a2b2f8d16d2d8 (commit) from 9a72065fa9de6f9bdf25bbf46137c7c6b4e8196e (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=a9d02dab77f697d03b252e188e13a33c66edbca7 commit a9d02dab77f697d03b252e188e13a33c66edbca7 Merge: abd223cf05 a53921b016 Author: Brad King AuthorDate: Thu Oct 31 09:13:41 2019 -0400 Commit: Brad King CommitDate: Thu Oct 31 09:13:41 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abd223cf05ac033e6c79b2487059009fbab0eef0 commit abd223cf05ac033e6c79b2487059009fbab0eef0 Merge: e5b90743e6 1e05f89f4b Author: Brad King AuthorDate: Thu Oct 31 13:10:10 2019 + Commit: Kitware Robot CommitDate: Thu Oct 31 09:11:19 2019 -0400 Merge topic 'swift-rpath' 1e05f89f4b Swift: support `BUILD_RPATH` properties Acked-by: Kitware Robot Merge-request: !3965 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5b90743e6bb169bd4bd6b1b8672f3cf3091d6e8 commit e5b90743e6bb169bd4bd6b1b8672f3cf3091d6e8 Merge: 6f15cea15e e0412a0e0b Author: Brad King AuthorDate: Thu Oct 31 13:09:50 2019 + Commit: Kitware Robot CommitDate: Thu Oct 31 09:10:23 2019 -0400 Merge topic 'help-file-spelling-error' e0412a0e0b Help: Fix spelling error in file(GET_RUNTIME_DEPENDENCIES) docs Acked-by: Kitware Robot Merge-request: !3964 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f15cea15ef510274fb062742744f23550260d01 commit 6f15cea15ef510274fb062742744f23550260d01 Merge: 9a72065fa9 90d643c312 Author: Brad King AuthorDate: Thu Oct 31 13:09:30 2019 + Commit: Kitware Robot CommitDate: Thu Oct 31 09:09:39 2019 -0400 Merge topic 'autogen_windows_search_fix' 90d643c312 Autogen: Fix ambiguity in header file detection on Windows Acked-by: Kitware Robot Merge-request: !3962 --- Summary of changes: Help/command/file.rst | 2 +- Modules/CMakeSwiftInformation.cmake | 4 Source/cmQtAutoMocUic.cxx | 8 +++- 3 files changed, 8 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-191-g9a72065fa9
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 9a72065fa9de6f9bdf25bbf46137c7c6b4e8196e (commit) via 5ddcaae77c531fc2e696204799505fbccb18b10d (commit) via fe6725a1f7c055b920508e7179fbc21a38cd37d3 (commit) from fde927d76b9d5fcb6721140cf14b6a56156d5c4c (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=9a72065fa9de6f9bdf25bbf46137c7c6b4e8196e commit 9a72065fa9de6f9bdf25bbf46137c7c6b4e8196e Merge: fde927d76b 5ddcaae77c Author: Brad King AuthorDate: Thu Oct 31 12:54:35 2019 + Commit: Kitware Robot CommitDate: Thu Oct 31 08:54:45 2019 -0400 Merge topic 'update-kwsys' 5ddcaae77c Merge branch 'upstream-KWSys' into update-kwsys fe6725a1f7 KWSys 2019-10-30 (43131a7c) Acked-by: Kitware Robot Merge-request: !3963 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ddcaae77c531fc2e696204799505fbccb18b10d commit 5ddcaae77c531fc2e696204799505fbccb18b10d Merge: 5b64788c51 fe6725a1f7 Author: Brad King AuthorDate: Wed Oct 30 09:17:30 2019 -0400 Commit: Brad King CommitDate: Wed Oct 30 09:17:30 2019 -0400 Merge branch 'upstream-KWSys' into update-kwsys # By KWSys Upstream * upstream-KWSys: KWSys 2019-10-30 (43131a7c) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe6725a1f7c055b920508e7179fbc21a38cd37d3 commit fe6725a1f7c055b920508e7179fbc21a38cd37d3 Author: KWSys Upstream AuthorDate: Wed Oct 30 09:16:39 2019 -0400 Commit: Brad King CommitDate: Wed Oct 30 09:17:30 2019 -0400 KWSys 2019-10-30 (43131a7c) Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 43131a7c283dd6f198a2318a25e546a97ac356b3 (master). Upstream Shortlog - Brad King (1): cdd52ce1 RegularExpression: Initialize RegularExpressionMatch arrays fully Todd Martin (1): 569a1aed Encoding: Add ToWindowsExtendedPath support for wide string diff --git a/Encoding.hxx.in b/Encoding.hxx.in index b06752115c..75a2d4d0f9 100644 --- a/Encoding.hxx.in +++ b/Encoding.hxx.in @@ -68,6 +68,8 @@ public: * absolute paths with Windows-style backslashes. **/ static std::wstring ToWindowsExtendedPath(std::string const&); + static std::wstring ToWindowsExtendedPath(const char* source); + static std::wstring ToWindowsExtendedPath(std::wstring const& wsource); # endif #endif // @KWSYS_NAMESPACE@_STL_HAS_WSTRING diff --git a/EncodingCXX.cxx b/EncodingCXX.cxx index 4593c9251c..5cad934ec3 100644 --- a/EncodingCXX.cxx +++ b/EncodingCXX.cxx @@ -221,8 +221,18 @@ std::string Encoding::ToNarrow(const wchar_t* wcstr) // Convert local paths to UNC style paths std::wstring Encoding::ToWindowsExtendedPath(std::string const& source) { - std::wstring wsource = Encoding::ToWide(source); + return ToWindowsExtendedPath(ToWide(source)); +} +// Convert local paths to UNC style paths +std::wstring Encoding::ToWindowsExtendedPath(const char* source) +{ + return ToWindowsExtendedPath(ToWide(source)); +} + +// Convert local paths to UNC style paths +std::wstring Encoding::ToWindowsExtendedPath(std::wstring const& wsource) +{ // Resolve any relative paths DWORD wfull_len; @@ -269,7 +279,7 @@ std::wstring Encoding::ToWindowsExtendedPath(std::string const& source) // If this case has been reached, then the path is invalid. Leave it // unchanged - return Encoding::ToWide(source); + return wsource; } # endif diff --git a/RegularExpression.hxx.in b/RegularExpression.hxx.in index df7eb45589..0c2366b842 100644 --- a/RegularExpression.hxx.in +++ b/RegularExpression.hxx.in @@ -70,10 +70,10 @@ private: * \brief Creates an invalid match object */ inline RegularExpressionMatch::RegularExpressionMatch() + : startp{} + , endp{} + , searchstring{} { - startp[0] = nullptr; - endp[0] = nullptr; - searchstring = nullptr; } /** --- Summary of changes: Source/kwsys/Encoding.hxx.in | 2 ++ Source/kwsys/EncodingCXX.cxx | 14 -- Source/kwsys/RegularExpression.hxx.in | 6 +++--- 3 files changed, 17 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-188-gfde927d76b
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 fde927d76b9d5fcb6721140cf14b6a56156d5c4c (commit) via e5cc8f575b81fa3af001d69b0737269f04cf94b2 (commit) via 8259ea3014b96a068641ebd34f0c0837e35e4545 (commit) via fea940eb869a4730c3c4a859fa9fedbc5f2233c9 (commit) from e4a5215e97fedf878ec9818c18040c6c34d206f1 (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=fde927d76b9d5fcb6721140cf14b6a56156d5c4c commit fde927d76b9d5fcb6721140cf14b6a56156d5c4c Merge: 8259ea3014 e5cc8f575b Author: Craig Scott AuthorDate: Thu Oct 31 21:28:40 2019 +1100 Commit: Craig Scott CommitDate: Thu Oct 31 21:28:40 2019 +1100 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8259ea3014b96a068641ebd34f0c0837e35e4545 commit 8259ea3014b96a068641ebd34f0c0837e35e4545 Merge: e4a5215e97 fea940eb86 Author: Craig Scott AuthorDate: Thu Oct 31 10:26:35 2019 + Commit: Kitware Robot CommitDate: Thu Oct 31 06:26:46 2019 -0400 Merge topic 'docs-CMakePrintHelpers-typo' fea940eb86 Help: Fix minor typo in CMakePrintHelpers module docs Acked-by: Kitware Robot Merge-request: !3966 --- Summary of changes: Modules/CMakePrintHelpers.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc2-31-ge5cc8f575b
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, release has been updated via e5cc8f575b81fa3af001d69b0737269f04cf94b2 (commit) via fea940eb869a4730c3c4a859fa9fedbc5f2233c9 (commit) from 1efc4c9051b1ec38dd182f743ea1562ac6ef6916 (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 - --- Summary of changes: Modules/CMakePrintHelpers.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-184-ge4a5215e97
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 e4a5215e97fedf878ec9818c18040c6c34d206f1 (commit) from 79e0cd9696b57c4b084c2203381245abc2b92a30 (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=e4a5215e97fedf878ec9818c18040c6c34d206f1 commit e4a5215e97fedf878ec9818c18040c6c34d206f1 Author: Kitware Robot AuthorDate: Thu Oct 31 00:01:10 2019 -0400 Commit: Kitware Robot CommitDate: Thu Oct 31 00:01:10 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index af16e4f049..01dbbdf4e9 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191030) +set(CMake_VERSION_PATCH 20191031) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.15.5, created. v3.15.5
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 annotated tag, v3.15.5 has been created at 5654424e1eafd11c2330a4ebd595da251fe8ef9a (tag) tagging 2a5e5b25ba4d6eb68dbee29381774562c98e228f (commit) replaces v3.15.4 tagged by Brad King on Wed Oct 30 10:46:53 2019 -0400 - Log - CMake 3.15.5 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl25ol0WHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhIiVD/4grvOS7tZdhZfENf/01rM0gkI4 RCwcbjypOpFn5m32sCiGoKZm5iqPIE0trzW8biqzh0aZLlliAZXguAvL7hJpz63v NDoJas7I2Hp3v2QOciSJ0wkXSBvrm6clBML4YFlc7qT9dwkBYz/J2wPaeu8/H5+U oPXXa9EtqCrNSWEfflcnfFWZxWw5J4jfb/ij7wWrX9HNHj2BSSwarUJ/ER3YmCqm sqX3tZg3u0xGD5pSjJQrWh09N/PyycTQXO8rP7J/6tVXvADLfmvkSdNWkf76KUpj /VzSefBjXaw1Bj4vTy/uVMd3ZmHrDmcSTIEI3ccR4LUelmRSywKonqsVXg21Bzc+ angKmEkcMV/aGmxNXpNwRJ7Xkm3gmrF8HywDquJpNVR2HxOA+8YyflJFsRx6OCr4 AMobjsxrnbR6Y44or8RB70L/VU8qWLTYoXmhyFnZdezVv/JkkofOc1LKWOsOfEOh 7HXfpzToVSdWT8Reuhdhx0c76/dMvBnMGpRzvV93BcE/9nHHV15jS/42piyqPwzx pDN20i3rYZQN5hrYInPjO9dj2F7uB/3Yc4w+JvCJ4+adWRleVHMed2dJrDtrf6nK eEHFijp1EdtNuCtl3/ppwzBY/90ukrlt4GLle4Yclu5gCUtdnpj5j8gOihu2QhV8 KoViko1fRFjjtAkUIg== =LS3I -END PGP SIGNATURE- Alan W. Irwin (1): Help: Fix COMPILE_LANG_AND_ID genex example Brad King (13): VS: Fix support for v142 toolset minor versions Merge branch 'vs-v142-version' into release-3.15 Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targets Merge branch 'backport-xcode-scheme-custom-target' into release-3.15 VS: Tell VS 16.4 not to verify CMake-provided custom command outputs Merge branch 'backport-vs-16.4-global-targets' into release-3.15 VS: Add toolset v142 CSharp flag table Merge branch 'vs-v142-csharp-flags' into release-3.15 IRSL: Prefer MSVC runtime libraries from newest toolset first IRSL: Install vcruntime140_1.dll if available Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15 Merge branch 'doc-genex-tweak' into release-3.15 CMake 3.15.5 --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-183-g79e0cd9696
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 79e0cd9696b57c4b084c2203381245abc2b92a30 (commit) via 2a5e5b25ba4d6eb68dbee29381774562c98e228f (commit) from dbf5ae35b52eb55be7ea135df082cc6e84f64b7f (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=79e0cd9696b57c4b084c2203381245abc2b92a30 commit 79e0cd9696b57c4b084c2203381245abc2b92a30 Merge: dbf5ae35b5 2a5e5b25ba Author: Brad King AuthorDate: Wed Oct 30 10:47:14 2019 -0400 Commit: Brad King CommitDate: Wed Oct 30 10:47:14 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a5e5b25ba4d6eb68dbee29381774562c98e228f commit 2a5e5b25ba4d6eb68dbee29381774562c98e228f Author: Brad King AuthorDate: Wed Oct 30 09:44:41 2019 -0400 Commit: Brad King CommitDate: Wed Oct 30 09:44:41 2019 -0400 CMake 3.15.5 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 6a6415382d..3bb8cc37fe 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 4) +set(CMake_VERSION_PATCH 5) #set(CMake_VERSION_RC 0) --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-181-gdbf5ae35b5
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 dbf5ae35b52eb55be7ea135df082cc6e84f64b7f (commit) via f22d4809a4770a4f2fbd714443846f5ddf879e5b (commit) via 03a0d8ffd4b871cfd81d7c2adf00cd27846f7692 (commit) via 1efc4c9051b1ec38dd182f743ea1562ac6ef6916 (commit) via 28a8561885d5d9e4a8e117545d77e6750031742a (commit) via 9a08818e54602664506c437aa52b15104166581b (commit) via 931d734a3ffa78a529c3eba32670994f9d6056bc (commit) via 1dbf485934da62b92bed63defb236254ffbeaa10 (commit) via fe5ba71bd0dba82d8a3093217ec1fcec1dd00ac6 (commit) via 3cf71e8c7d7a1ed83db5ea6e5a110346807b307b (commit) from 5b64788c51f7676276c0d8685003fd002b27388b (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=dbf5ae35b52eb55be7ea135df082cc6e84f64b7f commit dbf5ae35b52eb55be7ea135df082cc6e84f64b7f Merge: f22d4809a4 fe5ba71bd0 Author: Brad King AuthorDate: Wed Oct 30 13:30:26 2019 + Commit: Kitware Robot CommitDate: Wed Oct 30 09:30:34 2019 -0400 Merge topic 'scanbuild-fixes' fe5ba71bd0 Tests: Suppress clang scan-build warning in UTF8 test 3cf71e8c7d cmLocalGenerator: Drop unused initializer in AddUnityBuild Acked-by: Kitware Robot Merge-request: !3958 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f22d4809a4770a4f2fbd714443846f5ddf879e5b commit f22d4809a4770a4f2fbd714443846f5ddf879e5b Merge: 03a0d8ffd4 1efc4c9051 Author: Brad King AuthorDate: Wed Oct 30 09:29:00 2019 -0400 Commit: Brad King CommitDate: Wed Oct 30 09:29:00 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03a0d8ffd4b871cfd81d7c2adf00cd27846f7692 commit 03a0d8ffd4b871cfd81d7c2adf00cd27846f7692 Merge: 28a8561885 9a08818e54 Author: Brad King AuthorDate: Wed Oct 30 13:26:39 2019 + Commit: Kitware Robot CommitDate: Wed Oct 30 09:26:54 2019 -0400 Merge topic 'fix-find_package-doc' 9a08818e54 Help: Add OPTIONAL_COMPONENTS to config mode signature of find_package. Acked-by: Kitware Robot Merge-request: !3961 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28a8561885d5d9e4a8e117545d77e6750031742a commit 28a8561885d5d9e4a8e117545d77e6750031742a Merge: 5b64788c51 1dbf485934 Author: Brad King AuthorDate: Wed Oct 30 13:25:40 2019 + Commit: Kitware Robot CommitDate: Wed Oct 30 09:25:48 2019 -0400 Merge topic 'bootstrap-break' 1dbf485934 bootstrap: Avoid redundant compiler selection checks Acked-by: Kitware Robot Merge-request: !3959 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe5ba71bd0dba82d8a3093217ec1fcec1dd00ac6 commit fe5ba71bd0dba82d8a3093217ec1fcec1dd00ac6 Author: Brad King AuthorDate: Tue Oct 29 11:20:47 2019 -0400 Commit: Brad King CommitDate: Tue Oct 29 11:20:47 2019 -0400 Tests: Suppress clang scan-build warning in UTF8 test Clang scan-build 7 reports: ``` Tests/CMakeLib/testUTF8.cxx:12:3: warning: 4th function call argument is an uninitialized value printf("[0x%02X,0x%02X,0x%02X,0x%02X]", static_cast(d[0]), ^~~ ``` Manual tracing of all call sites shows that all values are initialized. diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx index 986f5956ef..1bf88cf4cd 100644 --- a/Tests/CMakeLib/testUTF8.cxx +++ b/Tests/CMakeLib/testUTF8.cxx @@ -9,9 +9,11 @@ typedef char test_utf8_char[5]; static void test_utf8_char_print(test_utf8_char const c) { unsigned char const* d = reinterpret_cast(c); +#ifndef __clang_analyzer__ // somehow thinks arguments are not initialized printf("[0x%02X,0x%02X,0x%02X,0x%02X]", static_cast(d[0]), static_cast(d[1]), static_cast(d[2]), static_cast(d[3])); +#endif } static void byte_array_print(char const* s) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cf71e8c7d7a1ed83db5ea6e5a110346807b307b commit 3cf71e8c7d7a1ed83db5ea6e5a110346807b307b Author: Brad King AuthorDate: Mon Oct 28 15:51:52 2019 -0400 Commit: Brad King CommitDate: Mon Oct 28 15:52:55 2019 -0400 cmLocalGenerator: Drop unused initializer in AddUnityBuild Fix a warning from clang-scanbuild: warning: Value stored to 'chunk' during its initialization is never read for (size_t itemsLeft = filtered_sources.size(), chunk = batchSize, ^ ~ Simply remove the initializer. diff --git a
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc2-29-g1efc4c9051
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, release has been updated via 1efc4c9051b1ec38dd182f743ea1562ac6ef6916 (commit) via 9a08818e54602664506c437aa52b15104166581b (commit) via 931d734a3ffa78a529c3eba32670994f9d6056bc (commit) via 1dbf485934da62b92bed63defb236254ffbeaa10 (commit) from 449a29296dfc33ec6772199db2d91827abe5376f (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 - --- Summary of changes: Help/command/find_package.rst | 1 + bootstrap | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-171-g5b64788c51
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 5b64788c51f7676276c0d8685003fd002b27388b (commit) from 1fb483922557003aedf59b01742928543977e013 (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=5b64788c51f7676276c0d8685003fd002b27388b commit 5b64788c51f7676276c0d8685003fd002b27388b Author: Kitware Robot AuthorDate: Wed Oct 30 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Wed Oct 30 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f700953602..af16e4f049 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191029) +set(CMake_VERSION_PATCH 20191030) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc2-25-g449a29296d
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, release has been updated via 449a29296dfc33ec6772199db2d91827abe5376f (commit) via ee366b02734210da76a05d2c856283744cd4d13e (commit) via 84ce47325565b5f1df10fa00f5873a98c6019678 (commit) via c10c9f839aca3f630212869ac6738963c0e3e77e (commit) via f9193ca2ddfddd3fa9e642866ba3f614bbdbe996 (commit) via d9dd7cca66d005ca82ba8d3166207ca595cb1fce (commit) via a575fbc3cb202632f551ac134ff183665abe4487 (commit) via a0a7a45dbcc17000a5cb8223e86908f41c40faf5 (commit) via 049dbdd38c56ad9ea06af2032faf3348c3c76742 (commit) from 62267715fe6f69162b834c6ee96ca6073ff96d15 (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 - --- Summary of changes: Help/command/FIND_XXX.txt | 13 - Help/policy/CMP0074.rst| 6 ++--- Help/release/3.16.rst | 31 +++--- .../CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY.rst | 4 +-- .../CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH.rst | 17 +++- Help/variable/CMAKE_FIND_USE_CMAKE_PATH.rst| 17 +++- Help/variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH.rst | 17 +++- Help/variable/CMAKE_FIND_USE_PACKAGE_REGISTRY.rst | 22 +++ Help/variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH.rst | 17 +++- .../CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH.rst | 17 +++- Modules/CMakeSwiftInformation.cmake| 6 ++--- Modules/FindCurses.cmake | 8 +++--- Modules/Platform/Apple-Apple-Swift.cmake | 1 + 13 files changed, 101 insertions(+), 75 deletions(-) create mode 100644 Modules/Platform/Apple-Apple-Swift.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-170-g1fb4839225
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 1fb483922557003aedf59b01742928543977e013 (commit) via c299d10a2ee722c21cdcc554a17082b9c01435c7 (commit) via b4b6a3e7e54349cffafc5c81ecef72ee4596a0b4 (commit) via c37f4eff5e299212544089f692dc8b090992d7b8 (commit) via 449a29296dfc33ec6772199db2d91827abe5376f (commit) via ee366b02734210da76a05d2c856283744cd4d13e (commit) via f9193ca2ddfddd3fa9e642866ba3f614bbdbe996 (commit) via a575fbc3cb202632f551ac134ff183665abe4487 (commit) via 2086da1713f7c1626c45565c01bc6cd7967a7e25 (commit) via 66d969fcc490f09297714e98d7285512fd8d91e1 (commit) via 1d0e557aed926d4d11cc5cf579363bb7be058688 (commit) via c168e789dfeeb4e0bd5db96bb17e682a9fd92b1f (commit) via 3300070cc2e7cadcb0fe2a77d67d2099bf22e7ba (commit) from c5e22dfaea47b81ae2c354254bd696cd218297fb (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=1fb483922557003aedf59b01742928543977e013 commit 1fb483922557003aedf59b01742928543977e013 Merge: c299d10a2e 2086da1713 Author: Brad King AuthorDate: Tue Oct 29 15:17:46 2019 + Commit: Kitware Robot CommitDate: Tue Oct 29 11:18:16 2019 -0400 Merge topic 'ccmake_progress_bar_and_log_display' 2086da1713 ccmake: Add output and progress bar release note 66d969fcc4 ccmake: Don't overwrite the last character of the title 1d0e557aed ccmake: Display output during configure and generate c168e789df ccmake: Use the error display for all the logs 3300070cc2 ccmake: Display an ASCII progress bar in the status bar Acked-by: Kitware Robot Merge-request: !3942 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c299d10a2ee722c21cdcc554a17082b9c01435c7 commit c299d10a2ee722c21cdcc554a17082b9c01435c7 Merge: b4b6a3e7e5 c37f4eff5e Author: Brad King AuthorDate: Tue Oct 29 15:17:22 2019 + Commit: Kitware Robot CommitDate: Tue Oct 29 11:17:31 2019 -0400 Merge topic 'FindPackageModeMakefileTest-isysroot' c37f4eff5e FindPackageModeMakefileTest: macOS needs isysroot flag Acked-by: Kitware Robot Merge-request: !3956 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4b6a3e7e54349cffafc5c81ecef72ee4596a0b4 commit b4b6a3e7e54349cffafc5c81ecef72ee4596a0b4 Merge: c5e22dfaea 449a29296d Author: Brad King AuthorDate: Tue Oct 29 11:15:57 2019 -0400 Commit: Brad King CommitDate: Tue Oct 29 11:15:57 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c37f4eff5e299212544089f692dc8b090992d7b8 commit c37f4eff5e299212544089f692dc8b090992d7b8 Author: Craig Scott AuthorDate: Mon Oct 28 08:25:18 2019 +1100 Commit: Craig Scott CommitDate: Tue Oct 29 07:14:08 2019 +1100 FindPackageModeMakefileTest: macOS needs isysroot flag macOS/Xcode no longer populate /usr/include. Building with the compiler directly instead of using /usr/bin/c++ can result in missing headers without the -isysroot flag. Relates: #19885 diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt index 23832dacee..8a87a8c97d 100644 --- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt +++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt @@ -19,6 +19,14 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile" AND # configure a FindFoo.cmake so it knows where the library can be found configure_file(FindFoo.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindFoo.cmake @ONLY) +# Need the -isysroot flag on recentish macOS after command line tools +# no longer provide headers in /usr/include +if(APPLE AND CMAKE_OSX_SYSROOT) + set(__EXTRA_OSX_SYSROOT_FLAGS "-isysroot ${CMAKE_OSX_SYSROOT}") +else() + set(__EXTRA_OSX_SYSROOT_FLAGS "") +endif() + # now set up the test: file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk" CONTENT "CMAKE = \"$\"\n" diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in index 8e7ff72aa2..5ef67d031c 100644 --- a/Tests/FindPackageModeMakefileTest/Makefile.in +++ b/Tests/FindPackageModeMakefileTest/Makefile.in @@ -5,6 +5,7 @@ CMAKE_CURRENT_BINARY_DIR = "@CMAKE_CURRENT_BINARY_DIR@" CMAKE_CXX_COMPILER = "@CMAKE_CXX_COMPILER@" CMAKE_CXX_COMPILER_ID = "@CMAKE_CXX_COMPILER_ID@" CMAKE_CXX_FLAGS = @CMAKE_CXX_FLAGS@ +__EXTRA_OSX_SYSROOT_FLAGS = @__EXTRA_OSX_SYS
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-157-gc5e22dfaea
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 c5e22dfaea47b81ae2c354254bd696cd218297fb (commit) via c10c9f839aca3f630212869ac6738963c0e3e77e (commit) from e90f6bacd5e237716dc6e211fe9d22e5e57fd5d8 (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=c5e22dfaea47b81ae2c354254bd696cd218297fb commit c5e22dfaea47b81ae2c354254bd696cd218297fb Merge: e90f6bacd5 c10c9f839a Author: Brad King AuthorDate: Tue Oct 29 15:15:00 2019 + Commit: Kitware Robot CommitDate: Tue Oct 29 11:15:09 2019 -0400 Merge topic 'swift-sdk-on-mac' c10c9f839a Swift: Honor CMAKE_OSX_SYSROOT on Apple platforms Acked-by: Kitware Robot Merge-request: !3957 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c10c9f839aca3f630212869ac6738963c0e3e77e commit c10c9f839aca3f630212869ac6738963c0e3e77e Author: Brad King AuthorDate: Mon Oct 28 11:52:31 2019 -0400 Commit: Brad King CommitDate: Mon Oct 28 11:52:31 2019 -0400 Swift: Honor CMAKE_OSX_SYSROOT on Apple platforms Pass the value to the Swift compiler driver via `-sdk`. We already do this for C/C++ via `-isysroot`. This fixes command-line builds on macOS 10.15 with Xcode 11 Swift tools. Fixes: #19880 diff --git a/Modules/Platform/Apple-Apple-Swift.cmake b/Modules/Platform/Apple-Apple-Swift.cmake new file mode 100644 index 00..7ca3e36e9f --- /dev/null +++ b/Modules/Platform/Apple-Apple-Swift.cmake @@ -0,0 +1 @@ +set(CMAKE_Swift_SYSROOT_FLAG "-sdk") --- Summary of changes: Modules/Platform/Apple-Apple-Swift.cmake | 1 + 1 file changed, 1 insertion(+) create mode 100644 Modules/Platform/Apple-Apple-Swift.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-155-ge90f6bacd5
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 e90f6bacd5e237716dc6e211fe9d22e5e57fd5d8 (commit) via 84ce47325565b5f1df10fa00f5873a98c6019678 (commit) from 36516f0a504e586c0b31f64ad373cf355dfc1a88 (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=e90f6bacd5e237716dc6e211fe9d22e5e57fd5d8 commit e90f6bacd5e237716dc6e211fe9d22e5e57fd5d8 Merge: 36516f0a50 84ce473255 Author: Brad King AuthorDate: Tue Oct 29 14:39:31 2019 + Commit: Kitware Robot CommitDate: Tue Oct 29 10:39:41 2019 -0400 Merge topic 'FindCurses-formw' 84ce473255 FindCurses: use formw when wide support is requested Acked-by: Kitware Robot Merge-request: !3947 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84ce47325565b5f1df10fa00f5873a98c6019678 commit 84ce47325565b5f1df10fa00f5873a98c6019678 Author: nick black AuthorDate: Fri Oct 25 22:18:10 2019 -0400 Commit: Brad King CommitDate: Mon Oct 28 12:03:11 2019 -0400 FindCurses: use formw when wide support is requested Fixes: #19883 diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake index ad4052244e..e3e7273be7 100644 --- a/Modules/FindCurses.cmake +++ b/Modules/FindCurses.cmake @@ -51,9 +51,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake) # may be ncursesw if(NOT CURSES_NEED_WIDE) set(NCURSES_LIBRARY_NAME "ncurses") + set(CURSES_FORM_LIBRARY_NAME "form") else() set(NCURSES_LIBRARY_NAME "ncursesw") - # Also, if we are searchig fo wide curses - we are actually searching + set(CURSES_FORM_LIBRARY_NAME "formw") + # Also, if we are searching for wide curses - we are actually searching # for ncurses, we don't know about any other unicode version. set(CURSES_NEED_NCURSES TRUE) endif() @@ -223,8 +225,8 @@ if(NOT CURSES_NEED_WIDE) endif() endif() -find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}") -find_library(CURSES_FORM_LIBRARY form ) +find_library(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" HINTS "${_cursesLibDir}") +find_library(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" ) # Previous versions of FindCurses provided these values. if(NOT DEFINED FORM_LIBRARY) --- Summary of changes: Modules/FindCurses.cmake | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-153-g36516f0a50
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 36516f0a504e586c0b31f64ad373cf355dfc1a88 (commit) via 8db410f33620859474f272a82d1c8895538d66e2 (commit) via d9dd7cca66d005ca82ba8d3166207ca595cb1fce (commit) via a0a7a45dbcc17000a5cb8223e86908f41c40faf5 (commit) via 049dbdd38c56ad9ea06af2032faf3348c3c76742 (commit) from c0f17ef14fae6652ea5fd8c3511123a8e7b7 (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=36516f0a504e586c0b31f64ad373cf355dfc1a88 commit 36516f0a504e586c0b31f64ad373cf355dfc1a88 Merge: 8db410f336 d9dd7cca66 Author: Brad King AuthorDate: Tue Oct 29 14:33:20 2019 + Commit: Kitware Robot CommitDate: Tue Oct 29 10:34:17 2019 -0400 Merge topic 'swift-parallel-jobs' d9dd7cca66 Swift: correct flags for parallel jobs Acked-by: Kitware Robot Merge-request: !3950 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8db410f33620859474f272a82d1c8895538d66e2 commit 8db410f33620859474f272a82d1c8895538d66e2 Merge: c0f17e a0a7a45dbc Author: Brad King AuthorDate: Tue Oct 29 14:32:55 2019 + Commit: Kitware Robot CommitDate: Tue Oct 29 10:33:16 2019 -0400 Merge topic 'docs-find-vars' a0a7a45dbc Help: Fix markup errors, improve wording of CMAKE_FIND... variable docs 049dbdd38c Help: Document that _ROOT applies to config packages too Acked-by: Kitware Robot Merge-request: !3952 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9dd7cca66d005ca82ba8d3166207ca595cb1fce commit d9dd7cca66d005ca82ba8d3166207ca595cb1fce Author: Saleem Abdulrasool AuthorDate: Sat Oct 26 18:11:08 2019 -0700 Commit: Brad King CommitDate: Mon Oct 28 11:36:57 2019 -0400 Swift: correct flags for parallel jobs `-num-threads` is for the threading, not the job control. Use `-j` to launch the parallel jobs. This enables parallel builds for Swift again after driver updates preventing the parallelization through `-num-threads`. diff --git a/Modules/CMakeSwiftInformation.cmake b/Modules/CMakeSwiftInformation.cmake index 4f1d4f0cd8..69d3900797 100644 --- a/Modules/CMakeSwiftInformation.cmake +++ b/Modules/CMakeSwiftInformation.cmake @@ -72,7 +72,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows) endif() if(NOT CMAKE_Swift_CREATE_SHARED_LIBRARY) - set(CMAKE_Swift_CREATE_SHARED_LIBRARY " -output-file-map -incremental -num-threads ${CMAKE_Swift_NUM_THREADS} -emit-library -o -module-name -module-link-name -emit-module -emit-module-path -emit-dependencies ${CMAKE_Swift_IMPLIB_LINKER_FLAGS} ") + set(CMAKE_Swift_CREATE_SHARED_LIBRARY " -output-file-map -incremental -j ${CMAKE_Swift_NUM_THREADS} -emit-library -o -module-name -module-link-name -emit-module -emit-module-path -emit-dependencies ${CMAKE_Swift_IMPLIB_LINKER_FLAGS} ") endif() if(NOT CMAKE_Swift_CREATE_SHARED_MODULE) @@ -80,11 +80,11 @@ if(NOT CMAKE_Swift_CREATE_SHARED_MODULE) endif() if(NOT CMAKE_Swift_LINK_EXECUTABLE) - set(CMAKE_Swift_LINK_EXECUTABLE " -output-file-map -incremental -num-threads ${CMAKE_Swift_NUM_THREADS} -emit-executable -o -emit-module -emit-module-path -emit-dependencies ${CMAKE_Swift_IMPLIB_LINKER_FLAGS} ") + set(CMAKE_Swift_LINK_EXECUTABLE " -output-file-map -incremental -j ${CMAKE_Swift_NUM_THREADS} -emit-executable -o -emit-module -emit-module-path -emit-dependencies ${CMAKE_Swift_IMPLIB_LINKER_FLAGS} ") endif() if(NOT CMAKE_Swift_CREATE_STATIC_LIBRARY) - set(CMAKE_Swift_CREATE_STATIC_LIBRARY " -output-file-map -incremental -num-threads ${CMAKE_Swift_NUM_THREADS} -emit-library -static -o -module-name -module-link-name -emit-module -emit-module-path -emit-dependencies ") + set(CMAKE_Swift_CREATE_STATIC_LIBRARY " -output-file-map -incremental -j ${CMAKE_Swift_NUM_THREADS} -emit-library -static -o -module-name -module-link-name -emit-module -emit-module-path -emit-dependencies ") set(CMAKE_Swift_ARCHIVE_CREATE " crs ") set(CMAKE_Swift_ARCHIVE_FINISH "") https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0a7a45dbcc17000a5cb8223e86908f41c40faf5 commit a0a7a45dbcc17000a5cb8223e86908f41c40faf5 Author: Craig Scott AuthorDate: Sun Oct 27 16:11:55 2019 +1100 Commit: Craig Scott CommitDate: Sun Oct 27 18:11:00 2019 +1100 Help: Fix markup errors, improve wording of CMAKE_FIND... variable docs diff --git a/Help/release/3.16.rst b/Help/release/3.16.rst index 7992f2dbcf..570f536cdc 1
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-148-gcffff0f17e
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 c0f17ef14fae6652ea5fd8c3511123a8e7b7 (commit) from 92eb3a4475e92d993b901c06d967210912390ada (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=c0f17ef14fae6652ea5fd8c3511123a8e7b7 commit c0f17ef14fae6652ea5fd8c3511123a8e7b7 Author: Kitware Robot AuthorDate: Tue Oct 29 00:01:08 2019 -0400 Commit: Kitware Robot CommitDate: Tue Oct 29 00:01:08 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f73cd7dd92..f700953602 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191028) +set(CMake_VERSION_PATCH 20191029) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-147-g92eb3a4475
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 92eb3a4475e92d993b901c06d967210912390ada (commit) via 62267715fe6f69162b834c6ee96ca6073ff96d15 (commit) from 336a826f77be90229dc3ee82c647148bb02220a9 (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=92eb3a4475e92d993b901c06d967210912390ada commit 92eb3a4475e92d993b901c06d967210912390ada Merge: 336a826f77 62267715fe Author: Brad King AuthorDate: Mon Oct 28 11:28:27 2019 -0400 Commit: Brad King CommitDate: Mon Oct 28 11:28:27 2019 -0400 Merge branch 'release-3.16' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc2-16-g62267715fe
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, release has been updated via 62267715fe6f69162b834c6ee96ca6073ff96d15 (commit) via 3e30c4cc1fb116807feaae326dab3e14c51a8ae7 (commit) via 89ad3b395902252e0120d1a3f72f370b20e64e80 (commit) from c79e9d8c210fd928bfb39a57634094ab74f8d120 (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 - --- Summary of changes: Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt | 3 +-- Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt | 3 +-- Tests/RunCMake/Framework/RunCMakeTest.cmake | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-145-g336a826f77
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 336a826f77be90229dc3ee82c647148bb02220a9 (commit) via f289ab61e36b94b9b718aa22b55b79b882df7b93 (commit) via 3e30c4cc1fb116807feaae326dab3e14c51a8ae7 (commit) via 89ad3b395902252e0120d1a3f72f370b20e64e80 (commit) via c97abc96882caab6cba49f6ab1b00ceb88b5a757 (commit) from cb13aa580d918816538e76efb666f1209f0dd717 (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=336a826f77be90229dc3ee82c647148bb02220a9 commit 336a826f77be90229dc3ee82c647148bb02220a9 Merge: f289ab61e3 3e30c4cc1f Author: Brad King AuthorDate: Mon Oct 28 14:10:29 2019 + Commit: Kitware Robot CommitDate: Mon Oct 28 10:10:37 2019 -0400 Merge topic 'framework-tests-multiarch-old-macos' 3e30c4cc1f Tests: Match file command output for older macOS (Framework test) 89ad3b3959 Tests: Prevent CMP0012 policy warnings in Framework test output Acked-by: Kitware Robot Merge-request: !3954 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f289ab61e36b94b9b718aa22b55b79b882df7b93 commit f289ab61e36b94b9b718aa22b55b79b882df7b93 Merge: cb13aa580d c97abc9688 Author: Brad King AuthorDate: Mon Oct 28 14:05:42 2019 + Commit: Kitware Robot CommitDate: Mon Oct 28 10:06:40 2019 -0400 Merge topic 'cpack-nsis-uninstaller-name' c97abc9688 CPack/NSIS: Add option for custom Uninstall filename Acked-by: Kitware Robot Merge-request: !3945 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e30c4cc1fb116807feaae326dab3e14c51a8ae7 commit 3e30c4cc1fb116807feaae326dab3e14c51a8ae7 Author: Craig Scott AuthorDate: Sun Oct 27 23:29:29 2019 +1100 Commit: Craig Scott CommitDate: Sun Oct 27 23:48:41 2019 +1100 Tests: Match file command output for older macOS (Framework test) diff --git a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt index f664db91f8..4a92a455aa 100644 --- a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt +++ b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt @@ -1,3 +1,2 @@ -.*/Framework:( Mach-O universal binary with [^ -]*)? Mach-O[^ +.*/Framework( \(for architecture [^\)]+\))?:[ ]+Mach-O[^ ]* dynamically linked shared library.* diff --git a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt index 4b5f761af4..dd64717e68 100644 --- a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt +++ b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt @@ -1,2 +1 @@ -/Framework: (Mach-O universal binary with [^ -]*)?current ar archive random library +/Framework( \(for architecture [^\)]+\))?:[]+current ar archive random library https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89ad3b395902252e0120d1a3f72f370b20e64e80 commit 89ad3b395902252e0120d1a3f72f370b20e64e80 Author: Craig Scott AuthorDate: Sun Oct 27 23:28:17 2019 +1100 Commit: Craig Scott CommitDate: Sun Oct 27 23:28:17 2019 +1100 Tests: Prevent CMP0012 policy warnings in Framework test output diff --git a/Tests/RunCMake/Framework/RunCMakeTest.cmake b/Tests/RunCMake/Framework/RunCMakeTest.cmake index c7e1319c10..965fbf4317 100644 --- a/Tests/RunCMake/Framework/RunCMakeTest.cmake +++ b/Tests/RunCMake/Framework/RunCMakeTest.cmake @@ -25,7 +25,7 @@ function(framework_type_test Toolchain Type UseProperty) set(RunCMake_TEST_NO_CLEAN 1) set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/${Toolchain}.cmake") list(APPEND RunCMake_TEST_OPTIONS "-DFRAMEWORK_TYPE=${Type}") - if(NOT ${UseProperty}) + if(NOT UseProperty) list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_FRAMEWORK=YES") endif() https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c97abc96882caab6cba49f6ab1b00ceb88b5a757 commit c97abc96882caab6cba49f6ab1b00ceb88b5a757 Author: Johnny Jazeix AuthorDate: Fri Oct 25 12:08:58 2019 +0200 Commit: Brad King CommitDate: Fri Oct 25 14:13:25 2019 -0400 CPack/NSIS: Add option for custom Uninstall filename Fixes: #10728 diff --git a/Help/cpack_gen/nsis.rst b/Help/cpack_gen/nsis.rst index cd2aea682f..38676c4659 100644 --- a/Help/cpack_gen/nsis.rst +++ b/Help/cpack_gen/nsis.rst @@ -128,3 +128,8 @@ on Windows Nullsoft Scriptable Install System. set(CPACK_NSIS_MENU_LINKS "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html" "CMake Help" "https://cmake.
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-140-gcb13aa580d
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 cb13aa580d918816538e76efb666f1209f0dd717 (commit) via 5bc6230741008257c33e849e4b84a2c30c19d37c (commit) from 6ad91699bf349c6cd233d1016760410b69918b25 (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=cb13aa580d918816538e76efb666f1209f0dd717 commit cb13aa580d918816538e76efb666f1209f0dd717 Merge: 6ad91699bf 5bc6230741 Author: Brad King AuthorDate: Mon Oct 28 14:05:35 2019 + Commit: Kitware Robot CommitDate: Mon Oct 28 10:05:45 2019 -0400 Merge topic 'ExternalProject-git-no-recurse' 5bc6230741 ExternalProject: Option to turn off recursive update of git submodules Acked-by: Kitware Robot Merge-request: !3923 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bc6230741008257c33e849e4b84a2c30c19d37c commit 5bc6230741008257c33e849e4b84a2c30c19d37c Author: Charis Marangos AuthorDate: Wed Oct 16 04:19:18 2019 +0100 Commit: Brad King CommitDate: Thu Oct 24 13:36:19 2019 -0400 ExternalProject: Option to turn off recursive update of git submodules Fixes: #19832 diff --git a/Help/release/dev/ExternalProject-git-no-recurse.rst b/Help/release/dev/ExternalProject-git-no-recurse.rst new file mode 100644 index 00..b9e09d3564 --- /dev/null +++ b/Help/release/dev/ExternalProject-git-no-recurse.rst @@ -0,0 +1,7 @@ +ExternalProject-git-no-recurse +-- + +* The :module:`ExternalProject` module :command:`ExternalProject_Add` + command gained a ``GIT_SUBMODULES_RECURSE`` option to specify whether + Git submodules should be updated recursively. The default is on to + preserve existing behavior. diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 66061a137d..cd4e22d4e6 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -265,6 +265,11 @@ External Project Definition is set to ``NEW`` if this value is set to an empty string then no submodules are initialized or updated. + ``GIT_SUBMODULES_RECURSE `` +Specify whether git submodules (if any) should update recursively by +passing the ``--recursive`` flag to ``git submodule update``. +If not specified, the default is on. + ``GIT_SHALLOW `` When this option is enabled, the ``git clone`` operation will be given the ``--depth 1`` option. This performs a shallow clone, which avoids @@ -1065,7 +1070,7 @@ define_property(DIRECTORY PROPERTY "EP_UPDATE_DISCONNECTED" INHERITED "ExternalProject module." ) -function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_remote_name init_submodules git_submodules git_shallow git_progress git_config src_name work_dir gitclone_infofile gitclone_stampfile tls_verify) +function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_remote_name init_submodules git_submodules_recurse git_submodules git_shallow git_progress git_config src_name work_dir gitclone_infofile gitclone_stampfile tls_verify) if(NOT GIT_VERSION_STRING VERSION_LESS 1.8.5) # Use `git checkout --` to avoid ambiguity with a local path. set(git_checkout_explicit-- "--") @@ -1153,7 +1158,7 @@ endif() set(init_submodules ${init_submodules}) if(init_submodules) execute_process( -COMMAND \"${git_EXECUTABLE}\" ${git_options} submodule update --recursive --init ${git_submodules} +COMMAND \"${git_EXECUTABLE}\" ${git_options} submodule update ${git_submodules_recurse} --init ${git_submodules} WORKING_DIRECTORY \"${work_dir}/${src_name}\" RESULT_VARIABLE error_code ) @@ -1394,7 +1399,7 @@ if(error_code OR is_remote_ref OR NOT (\"\${tag_sha}\" STREQUAL \"\${head_sha}\" set(init_submodules ${init_submodules}) if(init_submodules) execute_process( - COMMAND \"${git_EXECUTABLE}\" submodule update --recursive --init ${git_submodules} + COMMAND \"${git_EXECUTABLE}\" submodule update ${git_submodules_recurse} --init ${git_submodules} WORKING_DIRECTORY \"${work_dir}/${src_name}\" RESULT_VARIABLE error_code ) @@ -2421,9 +2426,21 @@ function(_ep_add_download_command name) message(FATAL_ERROR "error: could not find git for clone of ${name}") endif() +get_property(git_submodules_recurse_set TARGET ${name} PROPERTY _EP_GIT_SUBMODULES_RECURSE SET) +if(NOT git_submodules_recurs
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-138-g6ad91699bf
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 6ad91699bf349c6cd233d1016760410b69918b25 (commit) via c79e9d8c210fd928bfb39a57634094ab74f8d120 (commit) via f4749489fdcc252e73f009e69dadc9480e84f611 (commit) from cdcc173e236963ad598b098d2d807d0489aa3d42 (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=6ad91699bf349c6cd233d1016760410b69918b25 commit 6ad91699bf349c6cd233d1016760410b69918b25 Merge: cdcc173e23 c79e9d8c21 Author: Craig Scott AuthorDate: Mon Oct 28 21:56:49 2019 +1100 Commit: Craig Scott CommitDate: Mon Oct 28 21:56:49 2019 +1100 Merge branch 'release-3.16' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc2-13-gc79e9d8c21
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, release has been updated via c79e9d8c210fd928bfb39a57634094ab74f8d120 (commit) via f4749489fdcc252e73f009e69dadc9480e84f611 (commit) via 9914b90f4a3be7d8357474f96c8091220d5cba24 (commit) via 82cdb26c93b595e3791818cc8f24dfc6935eb8a8 (commit) via 15a0b0d04660fdec8c231ec4d1054ff5f5274610 (commit) from 81ded33c04e0d7faff55b048877fcd795ce8afe0 (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 - --- Summary of changes: Help/command/math.rst | 3 ++- Modules/FindPython.cmake | 4 ++-- Modules/FindPython2.cmake | 4 ++-- Modules/FindPython3.cmake | 4 ++-- Source/cmProjectCommand.cxx | 3 ++- Tests/RunCMake/project/RunCMakeTest.cmake | 1 + Tests/RunCMake/project/VersionMax.cmake | 32 +++ 7 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 Tests/RunCMake/project/VersionMax.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-135-gcdcc173e23
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 cdcc173e236963ad598b098d2d807d0489aa3d42 (commit) via 82cdb26c93b595e3791818cc8f24dfc6935eb8a8 (commit) via 15a0b0d04660fdec8c231ec4d1054ff5f5274610 (commit) from e03b677e703f84c9d1a2875083d1290db16eb4ad (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=cdcc173e236963ad598b098d2d807d0489aa3d42 commit cdcc173e236963ad598b098d2d807d0489aa3d42 Merge: e03b677e70 82cdb26c93 Author: Craig Scott AuthorDate: Mon Oct 28 10:50:09 2019 + Commit: Kitware Robot CommitDate: Mon Oct 28 06:50:22 2019 -0400 Merge topic 'project-version-buffer-overflow' 82cdb26c93 project: Fix potential buffer write-past-end for version components 15a0b0d046 Help: math() expressions must be representable as signed 64-bit Acked-by: Kitware Robot Merge-request: !3948 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82cdb26c93b595e3791818cc8f24dfc6935eb8a8 commit 82cdb26c93b595e3791818cc8f24dfc6935eb8a8 Author: Craig Scott AuthorDate: Sat Oct 26 16:30:22 2019 +1100 Commit: Craig Scott CommitDate: Sat Oct 26 17:50:24 2019 +1100 project: Fix potential buffer write-past-end for version components This fixes two errors: not accounting for the trailing null and a misunderstanding of what std::numeric_limits::digits10 means. diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx index eb59b4f65a..7bb5209da0 100644 --- a/Source/cmProjectCommand.cxx +++ b/Source/cmProjectCommand.cxx @@ -224,7 +224,8 @@ bool cmProjectCommand(std::vector const& args, std::array version_components; if (cmp0096 == cmPolicies::OLD || cmp0096 == cmPolicies::WARN) { - char vb[MAX_VERSION_COMPONENTS][std::numeric_limits::digits10]; + char vb[MAX_VERSION_COMPONENTS] + [std::numeric_limits::digits10 + 2]; unsigned v[MAX_VERSION_COMPONENTS] = { 0, 0, 0, 0 }; const int vc = std::sscanf(version.c_str(), "%u.%u.%u.%u", [0], [1], [2], [3]); diff --git a/Tests/RunCMake/project/RunCMakeTest.cmake b/Tests/RunCMake/project/RunCMakeTest.cmake index 8f43a51803..69146993bd 100644 --- a/Tests/RunCMake/project/RunCMakeTest.cmake +++ b/Tests/RunCMake/project/RunCMakeTest.cmake @@ -22,6 +22,7 @@ run_cmake(VersionInvalid) run_cmake(VersionMissingLanguages) run_cmake(VersionMissingValueOkay) run_cmake(VersionTwice) +run_cmake(VersionMax) run_cmake(CMP0048-OLD) run_cmake(CMP0048-OLD-VERSION) diff --git a/Tests/RunCMake/project/VersionMax.cmake b/Tests/RunCMake/project/VersionMax.cmake new file mode 100644 index 00..e955364384 --- /dev/null +++ b/Tests/RunCMake/project/VersionMax.cmake @@ -0,0 +1,32 @@ +cmake_policy(SET CMP0048 NEW) +cmake_policy(SET CMP0096 OLD) + +enable_language(C) +include(CheckTypeSize) +check_type_size(unsigned __sizeOfUnsigned BUILTIN_TYPES_ONLY LANGUAGE C) + +# We can't use math() to compute this because it only supports up to +# 64-bit signed integers, so hard-code the types we expect to encounter +if(__sizeOfUnsigned EQUAL 0) + message(STATUS "Multi-architecture build, skipping project version check") + return() +elseif(__sizeOfUnsigned EQUAL 4) + set(maxVal 4294967295) +elseif(__sizeOfUnsigned EQUAL 8) + set(maxVal 18446744073709551615) +else() + message(FATAL_ERROR +"Test needs to be updated for unsigned integer size ${__sizeOfUnsigned}") +endif() + +# The real value of this test is when an address sanitizer is enabled. +# It catches situations where the size of the buffer used to compute or +# hold the version components as strings is too small. +project(ProjectA VERSION ${maxVal}.${maxVal}.${maxVal}.${maxVal} LANGUAGES NONE) + +if(NOT ${PROJECT_VERSION_MAJOR} EQUAL ${maxVal}) + message(FATAL_ERROR "Project version number parsing failed round trip.\n" +"Expected: ${maxVal}\n" +"Computed: ${PROJECT_VERSION_MAJOR}" + ) +endif() https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15a0b0d04660fdec8c231ec4d1054ff5f5274610 commit 15a0b0d04660fdec8c231ec4d1054ff5f5274610 Author: Craig Scott AuthorDate: Sat Oct 26 16:20:14 2019 +1100 Commit: Craig Scott CommitDate: Sat Oct 26 17:47:03 2019 +1100 Help: math() expressions must be representable as signed 64-bit diff --git a/Help/command/math.rst b/Help/command/math.rst index 3cbe719e56..ddb1ec63cf 100644 --- a/Help/command/math.rst +++ b/Help/command/math.rst @@ -8,7 +8,8 @@ Evaluate a mathematical expression. math(EXPR "" [OUTPUT_FORMAT ]
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-132-ge03b677e70
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 e03b677e703f84c9d1a2875083d1290db16eb4ad (commit) via 9914b90f4a3be7d8357474f96c8091220d5cba24 (commit) from 0e4190ba9eaa46fe009394d5c5022818ef669bd9 (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=e03b677e703f84c9d1a2875083d1290db16eb4ad commit e03b677e703f84c9d1a2875083d1290db16eb4ad Merge: 0e4190ba9e 9914b90f4a Author: Craig Scott AuthorDate: Mon Oct 28 10:44:05 2019 + Commit: Kitware Robot CommitDate: Mon Oct 28 06:44:17 2019 -0400 Merge topic 'docs-FindPython-minor-grammar' 9914b90f4a Help: Minor wording cleanup for Python modules Acked-by: Kitware Robot Merge-request: !3953 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9914b90f4a3be7d8357474f96c8091220d5cba24 commit 9914b90f4a3be7d8357474f96c8091220d5cba24 Author: Craig Scott AuthorDate: Sun Oct 27 21:36:31 2019 +1100 Commit: Craig Scott CommitDate: Sun Oct 27 21:36:31 2019 +1100 Help: Minor wording cleanup for Python modules diff --git a/Modules/FindPython.cmake b/Modules/FindPython.cmake index 3cc08a165b..2bdfaf393d 100644 --- a/Modules/FindPython.cmake +++ b/Modules/FindPython.cmake @@ -8,7 +8,7 @@ FindPython Find Python interpreter, compiler and development environment (include directories and libraries). -Three components are supported: +The following components are supported: * ``Interpreter``: search for Python interpreter. * ``Compiler``: search for Python compiler. Only offered by IronPython. @@ -16,7 +16,7 @@ Three components are supported: libraries). * ``NumPy``: search for NumPy include directories. -If no ``COMPONENTS`` is specified, ``Interpreter`` is assumed. +If no ``COMPONENTS`` are specified, ``Interpreter`` is assumed. To ensure consistent versions between components ``Interpreter``, ``Compiler``, ``Development`` and ``NumPy``, specify all components at the same time:: diff --git a/Modules/FindPython2.cmake b/Modules/FindPython2.cmake index 0cecdc69cf..3cc7d56792 100644 --- a/Modules/FindPython2.cmake +++ b/Modules/FindPython2.cmake @@ -8,7 +8,7 @@ FindPython2 Find Python 2 interpreter, compiler and development environment (include directories and libraries). -Three components are supported: +The following components are supported: * ``Interpreter``: search for Python 2 interpreter * ``Compiler``: search for Python 2 compiler. Only offered by IronPython. @@ -16,7 +16,7 @@ Three components are supported: libraries) * ``NumPy``: search for NumPy include directories. -If no ``COMPONENTS`` is specified, ``Interpreter`` is assumed. +If no ``COMPONENTS`` are specified, ``Interpreter`` is assumed. To ensure consistent versions between components ``Interpreter``, ``Compiler``, ``Development`` and ``NumPy``, specify all components at the same time:: diff --git a/Modules/FindPython3.cmake b/Modules/FindPython3.cmake index 1edb9c9f72..066d0df6a1 100644 --- a/Modules/FindPython3.cmake +++ b/Modules/FindPython3.cmake @@ -8,7 +8,7 @@ FindPython3 Find Python 3 interpreter, compiler and development environment (include directories and libraries). -Three components are supported: +The following components are supported: * ``Interpreter``: search for Python 3 interpreter * ``Compiler``: search for Python 3 compiler. Only offered by IronPython. @@ -16,7 +16,7 @@ Three components are supported: libraries) * ``NumPy``: search for NumPy include directories. -If no ``COMPONENTS`` is specified, ``Interpreter`` is assumed. +If no ``COMPONENTS`` are specified, ``Interpreter`` is assumed. To ensure consistent versions between components ``Interpreter``, ``Compiler``, ``Development`` and ``NumPy``, specify all components at the same time:: --- Summary of changes: Modules/FindPython.cmake | 4 ++-- Modules/FindPython2.cmake | 4 ++-- Modules/FindPython3.cmake | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-130-g0e4190ba9e
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 0e4190ba9eaa46fe009394d5c5022818ef669bd9 (commit) from f3968470ce71dbef596698816423efbf5c8f62d7 (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=0e4190ba9eaa46fe009394d5c5022818ef669bd9 commit 0e4190ba9eaa46fe009394d5c5022818ef669bd9 Author: Kitware Robot AuthorDate: Mon Oct 28 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Mon Oct 28 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b94a66884b..f73cd7dd92 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191027) +set(CMake_VERSION_PATCH 20191028) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-129-gf3968470ce
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 f3968470ce71dbef596698816423efbf5c8f62d7 (commit) from a8943971539aeb0df60b136d07e9c820c8be6f5e (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=f3968470ce71dbef596698816423efbf5c8f62d7 commit f3968470ce71dbef596698816423efbf5c8f62d7 Author: Kitware Robot AuthorDate: Sun Oct 27 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Sun Oct 27 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index dd57b09e56..b94a66884b 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191026) +set(CMake_VERSION_PATCH 20191027) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-128-ga894397153
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 a8943971539aeb0df60b136d07e9c820c8be6f5e (commit) from 5c8d821ecabb0fba28719000182f241b16d86b44 (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=a8943971539aeb0df60b136d07e9c820c8be6f5e commit a8943971539aeb0df60b136d07e9c820c8be6f5e Author: Kitware Robot AuthorDate: Sat Oct 26 00:01:09 2019 -0400 Commit: Kitware Robot CommitDate: Sat Oct 26 00:01:09 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 05137c83f6..dd57b09e56 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191025) +set(CMake_VERSION_PATCH 20191026) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-127-g5c8d821eca
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 5c8d821ecabb0fba28719000182f241b16d86b44 (commit) via f0005dacdeb04be2d335af938ff76d9e3ad5 (commit) from 5a3f539cd50621298d15df639c29a9c09aace443 (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=5c8d821ecabb0fba28719000182f241b16d86b44 commit 5c8d821ecabb0fba28719000182f241b16d86b44 Merge: 5a3f539cd5 f0005dacde Author: Brad King AuthorDate: Fri Oct 25 13:37:39 2019 + Commit: Kitware Robot CommitDate: Fri Oct 25 09:37:49 2019 -0400 Merge topic 'xcode-scheme-env' f0005dacde Xcode: Add CMAKE_XCODE_SCHEME_ENVIRONMENT variable Acked-by: Kitware Robot Merge-request: !3933 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0005dacdeb04be2d335af938ff76d9e3ad5 commit f0005dacdeb04be2d335af938ff76d9e3ad5 Author: Felix Heidrich AuthorDate: Thu Oct 17 12:45:20 2019 +0200 Commit: Brad King CommitDate: Thu Oct 24 11:24:34 2019 -0400 Xcode: Add CMAKE_XCODE_SCHEME_ENVIRONMENT variable Initialize the `XCODE_SCHEME_ENVIRONMENT` target property. This was left out of commit 6b7f1e1db0 (Xcode: Add variables and properties to configure schemes, 2018-07-29, v3.13.0-rc1~243^2). diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index cad0df6daf..b5415b79dd 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -241,6 +241,7 @@ Variables that Change Behavior /variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER /variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS /variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE + /variable/CMAKE_XCODE_SCHEME_ENVIRONMENT /variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC /variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP /variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES diff --git a/Help/release/dev/xcode-scheme-env.rst b/Help/release/dev/xcode-scheme-env.rst new file mode 100644 index 00..238cb618fa --- /dev/null +++ b/Help/release/dev/xcode-scheme-env.rst @@ -0,0 +1,5 @@ +xcode-scheme-env + + +* The :variable:`CMAKE_XCODE_SCHEME_ENVIRONMENT` variable was added + to initialize the :prop_tgt:`XCODE_SCHEME_ENVIRONMENT` target property. diff --git a/Help/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst b/Help/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst new file mode 100644 index 00..4832659ce7 --- /dev/null +++ b/Help/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst @@ -0,0 +1,15 @@ +CMAKE_XCODE_SCHEME_ENVIRONMENT +-- + +Specify environment variables that should be added to the Arguments +section of the generated Xcode scheme. + +If set to a list of environment variables and values of the form +``MYVAR=value`` those environment variables will be added to the +scheme. + +This variable initializes the :prop_tgt:`XCODE_SCHEME_ENVIRONMENT` +property on all targets. + +Please refer to the :prop_tgt:`XCODE_GENERATE_SCHEME` target property +documentation to see all Xcode schema related properties. diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 99c16f2374..472287f0e0 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -380,6 +380,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, initProp("XCODE_SCHEME_MALLOC_STACK"); initProp("XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE"); initProp("XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS"); + initProp("XCODE_SCHEME_ENVIRONMENT"); } #endif } --- Summary of changes: Help/manual/cmake-variables.7.rst | 1 + Help/release/dev/xcode-scheme-env.rst | 5 + .../CMAKE_XCODE_SCHEME_ENVIRONMENT.rst}| 7 +-- Source/cmTarget.cxx| 1 + 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 Help/release/dev/xcode-scheme-env.rst copy Help/{prop_tgt/XCODE_SCHEME_ENVIRONMENT.rst => variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst} (70%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-125-g5a3f539cd5
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 5a3f539cd50621298d15df639c29a9c09aace443 (commit) from b2b79e7776584d4903721756f39ccfcec8e560e9 (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=5a3f539cd50621298d15df639c29a9c09aace443 commit 5a3f539cd50621298d15df639c29a9c09aace443 Author: Kitware Robot AuthorDate: Fri Oct 25 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Fri Oct 25 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1c8e050c59..05137c83f6 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191024) +set(CMake_VERSION_PATCH 20191025) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-124-gb2b79e7776
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 b2b79e7776584d4903721756f39ccfcec8e560e9 (commit) via 2d1fd3f8188176e51cc30b64b471158a36916b65 (commit) from 11897b824cb18f40bcbcee03ab4cb106a10ee436 (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=b2b79e7776584d4903721756f39ccfcec8e560e9 commit b2b79e7776584d4903721756f39ccfcec8e560e9 Merge: 11897b824c 2d1fd3f818 Author: Brad King AuthorDate: Thu Oct 24 14:41:21 2019 + Commit: Kitware Robot CommitDate: Thu Oct 24 10:41:30 2019 -0400 Merge topic 'doc-dev-note-ext' 2d1fd3f818 Help: Fix missed extension for `CMAKE_MESSAGE_CONTEXT` release note Acked-by: Kitware Robot Merge-request: !3943 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d1fd3f8188176e51cc30b64b471158a36916b65 commit 2d1fd3f8188176e51cc30b64b471158a36916b65 Author: Alex Turbov AuthorDate: Thu Oct 24 13:07:51 2019 +0200 Commit: Alex Turbov CommitDate: Thu Oct 24 13:07:51 2019 +0200 Help: Fix missed extension for `CMAKE_MESSAGE_CONTEXT` release note diff --git a/Help/release/dev/feature-CMAKE_MESSAGE_CONTEXT b/Help/release/dev/feature-CMAKE_MESSAGE_CONTEXT.rst similarity index 100% rename from Help/release/dev/feature-CMAKE_MESSAGE_CONTEXT rename to Help/release/dev/feature-CMAKE_MESSAGE_CONTEXT.rst --- Summary of changes: .../{feature-CMAKE_MESSAGE_CONTEXT => feature-CMAKE_MESSAGE_CONTEXT.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Help/release/dev/{feature-CMAKE_MESSAGE_CONTEXT => feature-CMAKE_MESSAGE_CONTEXT.rst} (100%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc2-8-g81ded33c04
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, release has been updated via 81ded33c04e0d7faff55b048877fcd795ce8afe0 (commit) via fd867a49c4c9563c90bf9ebf66ba602dee072e35 (commit) from fa1fe09dbbf8e18e02a67dc20adb3cb523418ef6 (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 - --- Summary of changes: Help/policy/CMP0097.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-122-g11897b824c
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 11897b824cb18f40bcbcee03ab4cb106a10ee436 (commit) via 920dd9d56bca8f855675ecf65c13059d111c3ec6 (commit) via 26a0f5d6d428f025f4bfb987d6dc24acb0707aec (commit) via 81ded33c04e0d7faff55b048877fcd795ce8afe0 (commit) via fd867a49c4c9563c90bf9ebf66ba602dee072e35 (commit) via 39fbbd6feaec91bcb2d31ee01ec431d0791a2baf (commit) from 490da0bd337f33c51884d7fe3bd5ac042ac0b0c5 (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=11897b824cb18f40bcbcee03ab4cb106a10ee436 commit 11897b824cb18f40bcbcee03ab4cb106a10ee436 Merge: 920dd9d56b 81ded33c04 Author: Brad King AuthorDate: Thu Oct 24 08:03:40 2019 -0400 Commit: Brad King CommitDate: Thu Oct 24 08:03:40 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=920dd9d56bca8f855675ecf65c13059d111c3ec6 commit 920dd9d56bca8f855675ecf65c13059d111c3ec6 Merge: 26a0f5d6d4 fd867a49c4 Author: Brad King AuthorDate: Thu Oct 24 12:02:23 2019 + Commit: Kitware Robot CommitDate: Thu Oct 24 08:03:15 2019 -0400 Merge topic 'cmp0097-doc-fix' fd867a49c4 Help: Fix capitalization in CMP0097 documentation Acked-by: Kitware Robot Merge-request: !3941 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26a0f5d6d428f025f4bfb987d6dc24acb0707aec commit 26a0f5d6d428f025f4bfb987d6dc24acb0707aec Merge: 490da0bd33 39fbbd6fea Author: Brad King AuthorDate: Thu Oct 24 12:02:13 2019 + Commit: Kitware Robot CommitDate: Thu Oct 24 08:02:21 2019 -0400 Merge topic 'fortran-ext-F' 39fbbd6fea Fortran: Add .F extension to Source Files group Acked-by: Kitware Robot Merge-request: !3940 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39fbbd6feaec91bcb2d31ee01ec431d0791a2baf commit 39fbbd6feaec91bcb2d31ee01ec431d0791a2baf Author: Johnny Jazeix AuthorDate: Wed Oct 23 14:47:45 2019 +0200 Commit: Brad King CommitDate: Wed Oct 23 09:20:25 2019 -0400 Fortran: Add .F extension to Source Files group While at it, improve source layout of the regex string literal. Fixes: #8768 diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h index 82a3625b8b..19a0d29136 100644 --- a/Source/cmSourceFile.h +++ b/Source/cmSourceFile.h @@ -154,9 +154,8 @@ private: #define CM_HEADER_REGEX "\\.(h|hh|h\\+\\+|hm|hpp|hxx|in|txx|inl)$" #define CM_SOURCE_REGEX \ - "\\.(C|M|c|c\\+\\+|cc|cpp|cxx|cu|f|f90|for|fpp|ftn|m|mm|rc|def|r|odl|idl|" \ - "hpj" \ - "|bat)$" + "\\.(C|F|M|c|c\\+\\+|cc|cpp|cxx|cu|f|f90|for|fpp|ftn|m|mm|" \ + "rc|def|r|odl|idl|hpj|bat)$" #define CM_PCH_REGEX "cmake_pch\\.(h|hxx)$" --- Summary of changes: Help/policy/CMP0097.rst | 2 +- Source/cmSourceFile.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-116-g490da0bd33
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 490da0bd337f33c51884d7fe3bd5ac042ac0b0c5 (commit) from 44b5f037e66e58cb4b5f9877b568bc40b9b576ca (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=490da0bd337f33c51884d7fe3bd5ac042ac0b0c5 commit 490da0bd337f33c51884d7fe3bd5ac042ac0b0c5 Author: Kitware Robot AuthorDate: Thu Oct 24 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Thu Oct 24 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3332ba2f60..1c8e050c59 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191023) +set(CMake_VERSION_PATCH 20191024) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-115-g44b5f037e6
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 44b5f037e66e58cb4b5f9877b568bc40b9b576ca (commit) from 04e0fa3307f2376d3f6b8f6dd3c60157a4ef81b2 (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=44b5f037e66e58cb4b5f9877b568bc40b9b576ca commit 44b5f037e66e58cb4b5f9877b568bc40b9b576ca Author: Kitware Robot AuthorDate: Wed Oct 23 00:01:08 2019 -0400 Commit: Kitware Robot CommitDate: Wed Oct 23 00:01:08 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b966de986d..3332ba2f60 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191022) +set(CMake_VERSION_PATCH 20191023) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-114-g04e0fa3307
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 04e0fa3307f2376d3f6b8f6dd3c60157a4ef81b2 (commit) via c5892e484e21f49abf2afd1386720bf91adc (commit) from 24703b11b41e2e95d566ee911f0f87bdb47d4883 (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=04e0fa3307f2376d3f6b8f6dd3c60157a4ef81b2 commit 04e0fa3307f2376d3f6b8f6dd3c60157a4ef81b2 Merge: 24703b11b4 c5892e484e Author: Brad King AuthorDate: Tue Oct 22 12:57:34 2019 + Commit: Kitware Robot CommitDate: Tue Oct 22 08:57:44 2019 -0400 Merge topic 'android-native' c5892e484e Android: add support for native compilation, such as with the Termux app Acked-by: Kitware Robot Merge-request: !3917 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5892e484e21f49abf2afd1386720bf91adc commit c5892e484e21f49abf2afd1386720bf91adc Author: Butta AuthorDate: Tue Oct 15 13:24:02 2019 +0530 Commit: Butta CommitDate: Tue Oct 15 21:13:51 2019 +0530 Android: add support for native compilation, such as with the Termux app The CMake support for Android assumes cross-compilation using the NDK, so stub out that Android NDK support and use the Linux support that's already invoked. Set CMAKE_HOST_SYSTEM_NAME to "Android", rather than "Linux". Issue: #19840 diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake index dc208c600d..f3ec4da2d9 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -43,7 +43,7 @@ if(CMAKE_HOST_UNIX) else() exec_program(${CMAKE_UNAME} ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) endif() -if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$") +if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$|Android") exec_program(${CMAKE_UNAME} ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR RETURN_VALUE val) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND diff --git a/Modules/Platform/Android-Clang.cmake b/Modules/Platform/Android-Clang.cmake index 847178fbd4..759448b8ec 100644 --- a/Modules/Platform/Android-Clang.cmake +++ b/Modules/Platform/Android-Clang.cmake @@ -24,6 +24,14 @@ if(CMAKE_SYSTEM_VERSION EQUAL 1) return() endif() +# Natively compiling on an Android host doesn't use the NDK cross-compilation +# tools. +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android") + macro(__android_compiler_clang lang) + endmacro() + return() +endif() + include(Platform/Android-Common) # The NDK toolchain configuration files at: diff --git a/Modules/Platform/Android-Determine.cmake b/Modules/Platform/Android-Determine.cmake index e7c1b48a94..2225897fab 100644 --- a/Modules/Platform/Android-Determine.cmake +++ b/Modules/Platform/Android-Determine.cmake @@ -18,6 +18,12 @@ if(CMAKE_SYSTEM_VERSION EQUAL 1) return() endif() +# Natively compiling on an Android host doesn't use the NDK cross-compilation +# tools. +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android") + return() +endif() + cmake_policy(PUSH) cmake_policy(SET CMP0057 NEW) # if IN_LIST diff --git a/Modules/Platform/Android-Initialize.cmake b/Modules/Platform/Android-Initialize.cmake index a5d282085e..b90dd7a569 100644 --- a/Modules/Platform/Android-Initialize.cmake +++ b/Modules/Platform/Android-Initialize.cmake @@ -24,6 +24,12 @@ if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED) return() endif() +# Natively compiling on an Android host doesn't use the NDK cross-compilation +# tools. +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android") + return() +endif() + if(NOT CMAKE_SYSROOT) if(CMAKE_ANDROID_NDK) set(CMAKE_SYSROOT "${CMAKE_ANDROID_NDK}/platforms/android-${CMAKE_SYSTEM_VERSION}/arch-${CMAKE_ANDROID_ARCH}") diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake index f08f84176d..8ffa1b2d3b 100644 --- a/Modules/Platform/Android.cmake +++ b/Modules/Platform/Android.cmake @@ -2,6 +2,11 @@ include(Platform/Linux) set(ANDROID 1) +# Natively compiling on an Android host doesn't need these flags to be reset. +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android") + return() +endif() + # Conventionally Android does not use versioned soname # But in modern versions it is acceptable if(NOT DEFINED CMAKE_PLATFORM_NO_VERSIONED_SONAME) diff --git a/Modules/Platform/Android/Determine-Compiler.cmake b/Modules/Platform/Android/Determine-Compiler.cmake index 5c6b97b8bc..f9c2d8968a 100644 --- a/Modules/Platform/Andr
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-112-g24703b11b4
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 24703b11b41e2e95d566ee911f0f87bdb47d4883 (commit) from 48459ab820a3a72e83336a120327eb9425732865 (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=24703b11b41e2e95d566ee911f0f87bdb47d4883 commit 24703b11b41e2e95d566ee911f0f87bdb47d4883 Author: Kitware Robot AuthorDate: Tue Oct 22 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Tue Oct 22 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7c3804df20..b966de986d 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191021) +set(CMake_VERSION_PATCH 20191022) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-111-g48459ab820
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 48459ab820a3a72e83336a120327eb9425732865 (commit) via 0bf7a93f91de33bee151fc36c373a9f64f5db6c2 (commit) via fa1fe09dbbf8e18e02a67dc20adb3cb523418ef6 (commit) via 667f2861dcfc153caf7ae610a61b6b6bbc3445f0 (commit) via 53f95dc5fb161ed92fb9fcb8ecc31502c5e6417e (commit) via 8347c75d1e818154f13d7076966aedf3fb9f2c08 (commit) via 7b89ae8d7bb28d4e5a4fc64a12035d2db1f3765d (commit) via ede1bebd50af00fd6c657e6c5173cbaa71cb704c (commit) via eaebd4fc47e9f438607b5585b8a67df146dab8f6 (commit) via 308990b2bcf1a824cb641a31c7a63f0dbf8f7498 (commit) via 08173075c185da050f5aa58e4bd9b5fa6659c63e (commit) via 9276beae5e2ce958e4c88995af56fe580d894d8b (commit) via f7acc1266c64be58793cf926b41f0d58b5a55e2a (commit) via 8065a686ddcb54b10fd6758eca24280f3e68926b (commit) via 409891baf77b909d414add64268d1e5530ff6086 (commit) from 61c6d49f5a2f3024aca81bb1535ab804f94adfba (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=48459ab820a3a72e83336a120327eb9425732865 commit 48459ab820a3a72e83336a120327eb9425732865 Merge: 0bf7a93f91 fa1fe09dbb Author: Brad King AuthorDate: Mon Oct 21 11:29:45 2019 -0400 Commit: Brad King CommitDate: Mon Oct 21 11:29:45 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bf7a93f91de33bee151fc36c373a9f64f5db6c2 commit 0bf7a93f91de33bee151fc36c373a9f64f5db6c2 Merge: 667f2861dc 9276beae5e Author: Brad King AuthorDate: Mon Oct 21 15:29:01 2019 + Commit: Kitware Robot CommitDate: Mon Oct 21 11:29:12 2019 -0400 Merge topic 'ccmake-clear-help' 9276beae5e ccmake: Fully clear the 1st help line when processing Acked-by: Kitware Robot Merge-request: !3937 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=667f2861dcfc153caf7ae610a61b6b6bbc3445f0 commit 667f2861dcfc153caf7ae610a61b6b6bbc3445f0 Merge: 53f95dc5fb f7acc1266c Author: Brad King AuthorDate: Mon Oct 21 15:23:53 2019 + Commit: Kitware Robot CommitDate: Mon Oct 21 11:24:28 2019 -0400 Merge topic 'project-include-before' f7acc1266c project: Add variable CMAKE_PROJECT__INCLUDE_BEFORE Acked-by: Kitware Robot Merge-request: !3936 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53f95dc5fb161ed92fb9fcb8ecc31502c5e6417e commit 53f95dc5fb161ed92fb9fcb8ecc31502c5e6417e Merge: 8347c75d1e 8065a686dd Author: Brad King AuthorDate: Mon Oct 21 15:23:35 2019 + Commit: Kitware Robot CommitDate: Mon Oct 21 11:23:47 2019 -0400 Merge topic 'export-compile-commands-environment-variable' 8065a686dd Initialize CMAKE_EXPORT_COMPILE_COMMANDS from envvar of the same name Acked-by: Kitware Robot Merge-request: !3914 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8347c75d1e818154f13d7076966aedf3fb9f2c08 commit 8347c75d1e818154f13d7076966aedf3fb9f2c08 Merge: 7b89ae8d7b eaebd4fc47 Author: Brad King AuthorDate: Mon Oct 21 11:21:50 2019 -0400 Commit: Brad King CommitDate: Mon Oct 21 11:21:50 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b89ae8d7bb28d4e5a4fc64a12035d2db1f3765d commit 7b89ae8d7bb28d4e5a4fc64a12035d2db1f3765d Merge: ede1bebd50 08173075c1 Author: Brad King AuthorDate: Mon Oct 21 11:21:43 2019 -0400 Commit: Brad King CommitDate: Mon Oct 21 11:21:43 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ede1bebd50af00fd6c657e6c5173cbaa71cb704c commit ede1bebd50af00fd6c657e6c5173cbaa71cb704c Merge: 61c6d49f5a 409891baf7 Author: Brad King AuthorDate: Mon Oct 21 15:20:17 2019 + Commit: Kitware Robot CommitDate: Mon Oct 21 11:20:33 2019 -0400 Merge topic 'FindOpenMP-include-dir' 409891baf7 FindOpenMP: Allow try_compile() to find omp.h for AppleClang Acked-by: Kitware Robot Merge-request: !3916 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08173075c185da050f5aa58e4bd9b5fa6659c63e commit 08173075c185da050f5aa58e4bd9b5fa6659c63e Merge: 83dbef1135 c684db4ea8 Author: Brad King AuthorDate: Mon Oct 21 10:26:48 2019 -0400 Commit: Brad King CommitDate: Mon Oct 21 10:26:48 2019 -0400 Merge branch 'doc-genex-tweak' into release-3.15 Merge-request: !3939 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7acc1266c64be58793cf926b41f0d58b5a55e2a commit f7acc1266c64be58793cf926b41f0d58b5a55e2a Author: Deniz Bahadir AuthorDate: Fri Oct 18 12:
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc2-6-gfa1fe09dbb
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, release has been updated via fa1fe09dbbf8e18e02a67dc20adb3cb523418ef6 (commit) via eaebd4fc47e9f438607b5585b8a67df146dab8f6 (commit) via 308990b2bcf1a824cb641a31c7a63f0dbf8f7498 (commit) via c684db4ea8d4763a7a70582d24c4bf5ac14cfea4 (commit) via 9276beae5e2ce958e4c88995af56fe580d894d8b (commit) via 409891baf77b909d414add64268d1e5530ff6086 (commit) from 92780281c2e8a46223b262b152caa9c8329373b1 (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 - --- Summary of changes: Help/manual/cmake-generator-expressions.7.rst | 2 +- Modules/FindOpenMP.cmake | 43 ++- Source/CursesDialog/cmCursesMainForm.cxx | 2 +- Tests/FindOpenMP/Test/CMakeLists.txt | 1 + 4 files changed, 45 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-96-g61c6d49f5a
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 61c6d49f5a2f3024aca81bb1535ab804f94adfba (commit) via 50afd147f851aec03e203f2e8c413ab8a9e744c5 (commit) via c684db4ea8d4763a7a70582d24c4bf5ac14cfea4 (commit) via 55a0bebdd3d253f81bd89782702d481ac81110b3 (commit) via bcaecf6bcddfaec2b586bff870650a4a66b0ccc3 (commit) via 324988a6b101f29d148badc32b44964aedae1163 (commit) via fd2c9fac101ec6d341db5b30e9d1eba64fa23116 (commit) from a82a96f35b3970501cd552c36819f9313734f669 (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=61c6d49f5a2f3024aca81bb1535ab804f94adfba commit 61c6d49f5a2f3024aca81bb1535ab804f94adfba Merge: 50afd147f8 c684db4ea8 Author: Brad King AuthorDate: Mon Oct 21 15:19:37 2019 + Commit: Kitware Robot CommitDate: Mon Oct 21 11:19:45 2019 -0400 Merge topic 'doc-genex-tweak' c684db4ea8 Help: Fix COMPILE_LANG_AND_ID genex example Acked-by: Kitware Robot Merge-request: !3939 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50afd147f851aec03e203f2e8c413ab8a9e744c5 commit 50afd147f851aec03e203f2e8c413ab8a9e744c5 Merge: a82a96f35b 55a0bebdd3 Author: Brad King AuthorDate: Mon Oct 21 15:11:58 2019 + Commit: Kitware Robot CommitDate: Mon Oct 21 11:12:06 2019 -0400 Merge topic 'vs-per-config-sources' 55a0bebdd3 VS: Add support for per-config sources bcaecf6bcd Teach check for single-language targets to consider all configurations 324988a6b1 cmGeneratorTarget: Add GetAllConfigCompileLanguages method fd2c9fac10 cmGeneratorTarget: Return non-const sources from GetAllConfigSources Acked-by: Kitware Robot Merge-request: !3882 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c684db4ea8d4763a7a70582d24c4bf5ac14cfea4 commit c684db4ea8d4763a7a70582d24c4bf5ac14cfea4 Author: Alan W. Irwin AuthorDate: Mon Oct 21 10:21:16 2019 -0400 Commit: Brad King CommitDate: Mon Oct 21 10:25:41 2019 -0400 Help: Fix COMPILE_LANG_AND_ID genex example Fix the `COMPILE_LANGUAGE/CXX_COMPILER_ID` variant of the example to have the same meaning as the `COMPILE_LANG_AND_ID` variant. The inconsistency was introduced by commit 808b818063 (Genex: CompileLang and CompileLangAndId now match against a list of ids, 2019-05-30, v3.15.0-rc1~11^2~1). Fixes: #19862 diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index c0449fb4ae..e970379fad 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -195,7 +195,7 @@ Variable Queries .. code-block:: cmake target_compile_definitions(myapp - PRIVATE $<$,$>:COMPILING_CXX_WITH_CLANG> + PRIVATE $<$,$>:COMPILING_CXX_WITH_CLANG> $<$,$>:COMPILING_CXX_WITH_INTEL> $<$,$>:COMPILING_C_WITH_CLANG> ) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55a0bebdd3d253f81bd89782702d481ac81110b3 commit 55a0bebdd3d253f81bd89782702d481ac81110b3 Author: Brad King AuthorDate: Wed Oct 2 13:59:15 2019 -0400 Commit: Brad King CommitDate: Thu Oct 17 14:05:39 2019 -0400 VS: Add support for per-config sources Since commit 97cc29c766 (VS: Teach generators how to mark per-config source files, 2017-04-10, v3.9.0-rc1~268^2~2) the VS generators have known how to generate per-config sources. We've now converted most other code paths to support per-config sources, so drop the check that disallows it. This leaves only per-config support for precompiled headers and unity build transformations, but those are optional features that can be addressed later. Fixes: #18233 Issue: #19789 diff --git a/Help/release/dev/vs-per-config-sources.rst b/Help/release/dev/vs-per-config-sources.rst new file mode 100644 index 00..bf7572b6ed --- /dev/null +++ b/Help/release/dev/vs-per-config-sources.rst @@ -0,0 +1,5 @@ +vs-per-config-sources +- + +* :ref:`Visual Studio Generators` learned to support per-config sources. + Previously only :ref:`Command-Line Build Tool Generators` supported them. diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 6569e5ef61..54124070d7 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -799,15 +799,6 @@ void RegisterVisualStudioMacros(const std::string& macrosFile, bool cmGlobalVisualStudioGenerato
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-89-ga82a96f35b
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 a82a96f35b3970501cd552c36819f9313734f669 (commit) from 41854d608ba2c76f81a1488a6156606232184a5f (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=a82a96f35b3970501cd552c36819f9313734f669 commit a82a96f35b3970501cd552c36819f9313734f669 Author: Kitware Robot AuthorDate: Mon Oct 21 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Mon Oct 21 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ed093297c2..7c3804df20 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191020) +set(CMake_VERSION_PATCH 20191021) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-88-g41854d608b
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 41854d608ba2c76f81a1488a6156606232184a5f (commit) from 0671f71d70db238b35c7cd64296e0b9f3a5e68a9 (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=41854d608ba2c76f81a1488a6156606232184a5f commit 41854d608ba2c76f81a1488a6156606232184a5f Author: Kitware Robot AuthorDate: Sun Oct 20 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Sun Oct 20 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f129c3aa18..ed093297c2 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191019) +set(CMake_VERSION_PATCH 20191020) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-87-g0671f71d70
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 0671f71d70db238b35c7cd64296e0b9f3a5e68a9 (commit) from 493c4e781a35a92c5c912b22493b84de750b1fe1 (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=0671f71d70db238b35c7cd64296e0b9f3a5e68a9 commit 0671f71d70db238b35c7cd64296e0b9f3a5e68a9 Author: Kitware Robot AuthorDate: Sat Oct 19 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Sat Oct 19 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index beeb0a6dac..f129c3aa18 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191018) +set(CMake_VERSION_PATCH 20191019) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.16.0-rc2, created. v3.16.0-rc2
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 annotated tag, v3.16.0-rc2 has been created at 371dbf3c152a397447bfae8ddff298b64b01b83b (tag) tagging 92780281c2e8a46223b262b152caa9c8329373b1 (commit) replaces v3.16.0-rc1 tagged by Brad King on Fri Oct 18 10:35:38 2019 -0400 - Log - CMake 3.16.0-rc2 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl2pzboWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhERaD/9OVP0OTe1NQSzV5hE+AemsP6lk TGenQa7XQLAP3i6V4iEoGBjVal/VnwMLqT2VKwVdEyzQCj/rJlormMR18ejS48ug Zq0WWlTa4wgjDQWl6WJNMvciBZgunHq1QgSxWkzuOwDM89+WFQseH2vaDUyIuP4D avAl97+uFyiFkAdRHFZkISkKDY0unnMyGoxN4QdplrsbrOV+DR01eCzSPGma5oyl dc5GawFB2HdWFDC92hU2dvSQZL8kJOyyUGoOHK2Fe1gDszRMJNqtkhrZy9qMklJ6 i4wZc5FMCh4kGMPYtzH7Y2n0Nt5WkOBpeUK4IsK0j8cANRpmOlnYtn+DnI2vpdX0 ubGFJG+sBnsP5SO6KndKHMyWFnGKkgw0Fq/0ytrt5fa752AofY0Mevfj9nP0kKxF yeHN3YMPY0D7ATEuPQ8Ts2nnkhYVYdEOHHgO4N7buRKPp5jlVSxJJJL+T48L3O1N n+TNwRKYmTZ4VmooiGxsK0OWfj8DBszHWtpBFha5E1QrG3/cl/9Frpi370gXc5sH fu5ViCrBvHrnAh3+zsSmz16ezvpHO44hlkGi0AQ6r3/cqnldRNWrMBMe3lXTUJlU qcwWJErQuMUQGhO85L5O2YNJp35YK989+2goBEi93DhiIvnF4dlADcY3I+bHX2cT sB9+D/SZYgrZrlsPFQ== =S0Rj -END PGP SIGNATURE- Ben Boeckel (2): FindPostgreSQL: support version 12 FindPostgreSQL: support macports installation scheme Brad King (36): Intel: Fix default C++ dialect detection on Windows Tests: Update CompileFeatures test for Intel 19 with VS 2015 Help: Document CMAKE_UNITY_BUILD in 3.16 release notes Help: Improve UNITY_BUILD documentation formatting Help: Extend documentation of CMAKE_UNITY_BUILD variable Help: Document CMAKE_UNITY_BUILD/CMAKE_EXPORT_COMPILE_COMMANDS limitation Merge branch 'intel-19-compile-features' into release-3.16 Merge branch 'doc-unity-build' into release-3.16 Merge branch 'objc-c++flags' into release-3.16 Merge branch 'iar-8051-support' into release-3.16 Merge branch 'FindPostgreSQL-macports-and-v12' into release-3.16 VS: Add toolset v142 CSharp flag table Merge branch 'vs-v142-csharp-flags' into release-3.16 IRSL: Prefer MSVC runtime libraries from newest toolset first IRSL: Install vcruntime140_1.dll if available Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.16 CMakeVersion: Prefer Git information provided by 'git archive' exports Merge branch 'no-git-version' into release-3.16 Merge branch 'FindOpenMP-clang-HIP-device' into release-3.16 Merge branch 'cmake-initial-cache-relative' into release-3.16 Help: Clarify documentation of CMAKE_STATIC_LINKER_FLAGS CMakeFindBinUtils: Remove unnecessary variable unset calls Merge branch 'doc-static-lib-flags' into release-3.16 Merge branch 'FindHDF5-cray' into release-3.16 Merge branch 'FindCurses-tinfow' into release-3.16 Merge branch 'CMakeFindBinUtils-cleanup' into release-3.16 Merge branch 'swift-cross-compile' into release-3.16 Merge branch 'doc-add_link_options-typos' into release-3.16 PCH: Document and test COMPILE_LANGUAGE genex for per-language header Merge branch 'doc-pch-compile-language' into release-3.16 install,export: Do not treat language names as target names cmMakefileTargetGenerator: Inline WriteObjectBuildFile in only call site Merge branch 'export-target-lang-name' into release-3.16 PCH: Fix Makefile dependencies to rebuild PCH on header changes Merge branch 'pch-makefile-depends' into release-3.16 CMake 3.16.0-rc2 Cristian Adam (1): Objective-C: Do not treat Objective-C files as C++ files Konstantin Pyzhov (1): FindOpenMP: Add support for HIP clang device pass Kyle Edwards (1): CMakeVersion: Add option to disable Git suffix Manuel Herrmann (1): FindCurses: use tinfow when wide support is requested Micael Borgefeldt (2): IAR: Fix v850 assembler support file extensions IAR: Add 8051 support Peter Waller (1): cmake: Fix relative path regression in -C Saleem Abdulrasool (1): try_compile: support Swift for cross-compilation Tom Lankhorst (1): Help: Fix typos and style in add_link_options documentation Willem Deconinck (2): FindHDF5: Cray HDF5 Fortran module filename is usually capitalized FindHDF5: Append hdf5 to hdf5_hl to avoid undefined references --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc1-49-g92780281c2
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, release has been updated via 92780281c2e8a46223b262b152caa9c8329373b1 (commit) from 6dedb9742094470196698a5009441e3860e61f2a (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 - --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-135-g493c4e781a
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 493c4e781a35a92c5c912b22493b84de750b1fe1 (commit) via 92780281c2e8a46223b262b152caa9c8329373b1 (commit) from fdb41a5102e1fef50fb918eba5f84cfc19a62734 (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=493c4e781a35a92c5c912b22493b84de750b1fe1 commit 493c4e781a35a92c5c912b22493b84de750b1fe1 Merge: fdb41a5102 92780281c2 Author: Brad King AuthorDate: Fri Oct 18 10:36:40 2019 -0400 Commit: Brad King CommitDate: Fri Oct 18 10:36:40 2019 -0400 Merge branch 'release-3.16' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-133-gfdb41a5102
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 fdb41a5102e1fef50fb918eba5f84cfc19a62734 (commit) via b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565 (commit) via e7d57bc3c35e7c47746caf91591ef748b9ce3012 (commit) via 45b4b4b93076e16281ecee628ef8ffb0aae8f3d6 (commit) via 4bedf6c9fa3f55a19b09d5ab26cfd149ee2e13e6 (commit) via 548e9051a4f20657d04341107924171ea9d1bcb5 (commit) via 99e83d423500e11a8e85c2032e8c536bce175ed1 (commit) from c867981c9d9bc8548d34f726940cd50b8d05d71c (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=fdb41a5102e1fef50fb918eba5f84cfc19a62734 commit fdb41a5102e1fef50fb918eba5f84cfc19a62734 Merge: b34b4c5eac 4bedf6c9fa Author: Brad King AuthorDate: Fri Oct 18 13:01:57 2019 + Commit: Kitware Robot CommitDate: Fri Oct 18 09:02:29 2019 -0400 Merge topic 'variable_watch-modernize' 4bedf6c9fa Refactor: Modernize `cmVariableWatchCommand` a little Acked-by: Kitware Robot Merge-request: !3892 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565 commit b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565 Merge: c867981c9d e7d57bc3c3 Author: Brad King AuthorDate: Fri Oct 18 13:01:36 2019 + Commit: Kitware Robot CommitDate: Fri Oct 18 09:01:48 2019 -0400 Merge topic 'vs-vctargetspath' e7d57bc3c3 VS: Propagate CMAKE_VS_GLOBALS into custom targets 45b4b4b930 VS: Propagate CMAKE_VS_GLOBALS into compiler id projects 548e9051a4 VS: Add support to override VCTargetsPath through toolset 99e83d4235 cmake: Teach --build mode to load CMAKE_GENERATOR_TOOLSET Acked-by: Kitware Robot Merge-request: !3817 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7d57bc3c35e7c47746caf91591ef748b9ce3012 commit e7d57bc3c35e7c47746caf91591ef748b9ce3012 Author: Alexander Boczar AuthorDate: Mon Sep 16 16:55:26 2019 -0700 Commit: Brad King CommitDate: Thu Oct 17 10:19:01 2019 -0400 VS: Propagate CMAKE_VS_GLOBALS into custom targets Issue: #19708 diff --git a/Help/release/dev/vs-vctargetspath.rst b/Help/release/dev/vs-vctargetspath.rst index 462d183b2a..d40af349e4 100644 --- a/Help/release/dev/vs-vctargetspath.rst +++ b/Help/release/dev/vs-vctargetspath.rst @@ -6,4 +6,5 @@ vs-vctargetspath to specify the ``VCTargetsPath`` value for project files. * The :variable:`CMAKE_VS_GLOBALS` variable value now applies during - compiler identification. + compiler identification and in targets created by the + :command:`add_custom_target` command. diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 99c16f2374..a4f904b155 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -511,8 +511,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, initProp("DOTNET_TARGET_FRAMEWORK_VERSION"); } - if (this->GetType() != cmStateEnums::INTERFACE_LIBRARY && - this->GetType() != cmStateEnums::UTILITY) { + if (this->GetType() != cmStateEnums::INTERFACE_LIBRARY) { // check for "CMAKE_VS_GLOBALS" variable and set up target properties // if any https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45b4b4b93076e16281ecee628ef8ffb0aae8f3d6 commit 45b4b4b93076e16281ecee628ef8ffb0aae8f3d6 Author: Alexander Boczar AuthorDate: Thu Sep 26 17:37:47 2019 -0700 Commit: Brad King CommitDate: Thu Oct 17 10:18:52 2019 -0400 VS: Propagate CMAKE_VS_GLOBALS into compiler id projects Issue: #19708 diff --git a/Help/release/dev/vs-vctargetspath.rst b/Help/release/dev/vs-vctargetspath.rst index ff9d148134..462d183b2a 100644 --- a/Help/release/dev/vs-vctargetspath.rst +++ b/Help/release/dev/vs-vctargetspath.rst @@ -4,3 +4,6 @@ vs-vctargetspath * With :ref:`Visual Studio Generators` for VS 2010 and above, the :variable:`CMAKE_GENERATOR_TOOLSET` setting gained an option to specify the ``VCTargetsPath`` value for project files. + +* The :variable:`CMAKE_VS_GLOBALS` variable value now applies during + compiler identification. diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 976b291220..f7ef755aeb 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -320,6 +320,12 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} if(CMAKE_VS_PLATFORM_TOOLSET_VCTARGETS_CUSTOM_DIR) set(id_ToolsetVCTargetsDir "${CMAKE_VS_PLATFORM_TOOLSET_VCTARGETS_CUSTOM_DIR}") endif() +set(id_CustomGlobals "
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc1-48-g6dedb97420
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, release has been updated via 6dedb9742094470196698a5009441e3860e61f2a (commit) via 797689ab35c6f1edc37b120804e348b03ce7b161 (commit) via 0b10b3ed6b3ee644a44414d8b5c205d94a967c12 (commit) from 7aab792716bb647aac2b5802e6e21148471a0c79 (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 - --- Summary of changes: Source/cmMakefileTargetGenerator.cxx | 27 +-- Source/cmMakefileTargetGenerator.h| 5 - Tests/BuildDepends/CMakeLists.txt | 16 ++-- Tests/BuildDepends/Project/CMakeLists.txt | 6 ++ Tests/BuildDepends/Project/zot.cxx| 5 +++-- Tests/BuildDepends/Project/zot_pch.cxx| 6 ++ 6 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 Tests/BuildDepends/Project/zot_pch.cxx hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-126-gc867981c9d
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 c867981c9d9bc8548d34f726940cd50b8d05d71c (commit) via 1c84b5c86f23d3e1998f67d0cd417b317cd9558b (commit) via 6dedb9742094470196698a5009441e3860e61f2a (commit) via 797689ab35c6f1edc37b120804e348b03ce7b161 (commit) via 0b10b3ed6b3ee644a44414d8b5c205d94a967c12 (commit) from 154aa87ca6bd906b6422ad81f51161995c89cc14 (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=c867981c9d9bc8548d34f726940cd50b8d05d71c commit c867981c9d9bc8548d34f726940cd50b8d05d71c Merge: 1c84b5c86f 6dedb97420 Author: Brad King AuthorDate: Fri Oct 18 08:58:01 2019 -0400 Commit: Brad King CommitDate: Fri Oct 18 08:58:01 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c84b5c86f23d3e1998f67d0cd417b317cd9558b commit 1c84b5c86f23d3e1998f67d0cd417b317cd9558b Merge: 154aa87ca6 797689ab35 Author: Brad King AuthorDate: Fri Oct 18 12:57:06 2019 + Commit: Kitware Robot CommitDate: Fri Oct 18 08:57:16 2019 -0400 Merge topic 'pch-makefile-depends' 797689ab35 PCH: Fix Makefile dependencies to rebuild PCH on header changes 0b10b3ed6b cmMakefileTargetGenerator: Inline WriteObjectBuildFile in only call site Acked-by: Kitware Robot Merge-request: !3928 --- Summary of changes: Source/cmMakefileTargetGenerator.cxx | 27 +-- Source/cmMakefileTargetGenerator.h| 5 - Tests/BuildDepends/CMakeLists.txt | 16 ++-- Tests/BuildDepends/Project/CMakeLists.txt | 6 ++ Tests/BuildDepends/Project/zot.cxx| 5 +++-- Tests/BuildDepends/Project/zot_pch.cxx| 6 ++ 6 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 Tests/BuildDepends/Project/zot_pch.cxx hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-121-g154aa87ca6
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 154aa87ca6bd906b6422ad81f51161995c89cc14 (commit) from f6dac38c1120660c589b218e9d55cef190089dae (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=154aa87ca6bd906b6422ad81f51161995c89cc14 commit 154aa87ca6bd906b6422ad81f51161995c89cc14 Author: Kitware Robot AuthorDate: Fri Oct 18 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Fri Oct 18 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c15eda7281..beeb0a6dac 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191017) +set(CMake_VERSION_PATCH 20191018) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc1-45-g7aab792716
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, release has been updated via 7aab792716bb647aac2b5802e6e21148471a0c79 (commit) via 0e436c573c52add744f0ff7c8845be9c7ff381a0 (commit) via 84e14a52ff694b5fc28511bae68dbb1e39dde246 (commit) via ac75886525c647ef7081dc11f6c0c128463b7ecd (commit) from c2a7729177fa62a4a8eb3e2f7385f3f517c42f91 (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 - --- Summary of changes: Help/command/target_precompile_headers.rst | 4 +++ Source/cmExportFileGenerator.cxx | 31 +- Source/cmExportFileGenerator.h | 8 +- Tests/ExportImport/Export/CMakeLists.txt | 5 .../PrecompileHeaders/PchMultilanguage-check.cmake | 14 ++ .../PrecompileHeaders/PchMultilanguage.cmake | 5 +++- 6 files changed, 52 insertions(+), 15 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-120-gf6dac38c11
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 f6dac38c1120660c589b218e9d55cef190089dae (commit) via 5417737fac3b6dce325a1e7b97267f974837da70 (commit) via d61b8921acde5650dbe6d20ec7b77c6f7522c876 (commit) via 7aab792716bb647aac2b5802e6e21148471a0c79 (commit) via 84e14a52ff694b5fc28511bae68dbb1e39dde246 (commit) via ac75886525c647ef7081dc11f6c0c128463b7ecd (commit) via 553658393c0e775efdec6b29b69c1274fb771e83 (commit) from ea048ed66c488a57ff1fe4477e07b489bf235972 (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=f6dac38c1120660c589b218e9d55cef190089dae commit f6dac38c1120660c589b218e9d55cef190089dae Merge: 5417737fac 7aab792716 Author: Brad King AuthorDate: Thu Oct 17 13:55:23 2019 -0400 Commit: Brad King CommitDate: Thu Oct 17 13:55:23 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5417737fac3b6dce325a1e7b97267f974837da70 commit 5417737fac3b6dce325a1e7b97267f974837da70 Merge: d61b8921ac 553658393c Author: Brad King AuthorDate: Thu Oct 17 17:54:11 2019 + Commit: Kitware Robot CommitDate: Thu Oct 17 13:54:26 2019 -0400 Merge topic 'graphviz' 553658393c Graphviz: added test suite, fixes, enhancements Acked-by: Kitware Robot Acked-by: slodki Merge-request: !3766 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d61b8921acde5650dbe6d20ec7b77c6f7522c876 commit d61b8921acde5650dbe6d20ec7b77c6f7522c876 Merge: ea048ed66c ac75886525 Author: Brad King AuthorDate: Thu Oct 17 17:52:28 2019 + Commit: Kitware Robot CommitDate: Thu Oct 17 13:52:49 2019 -0400 Merge topic 'doc-pch-compile-language' ac75886525 PCH: Document and test COMPILE_LANGUAGE genex for per-language header Acked-by: Kitware Robot Merge-request: !3925 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=553658393c0e775efdec6b29b69c1274fb771e83 commit 553658393c0e775efdec6b29b69c1274fb771e83 Author: Corentin Plouet AuthorDate: Tue Oct 8 13:45:30 2019 +1100 Commit: Corentin Plouet CommitDate: Tue Oct 8 13:45:56 2019 +1100 Graphviz: added test suite, fixes, enhancements * Added a fairly comprehensive test suite * Separated the graph traversal logic from the Graphviz generation code by introducing a new class, cmLinkItemsGraphVisitor{.h,cxx} * Made the graph traversal logic less ad-hoc by using existing methods in the GlobalGenerator; this fixed a few bugs * Added support for new target types: custom targets, object and unknown libraries * Improved support for ALIAS libraries by showing the alias(es) in the graph * Introduced new flags to control those new libraries (consistent with existing flags) * Updated the documentation * Removed useless setting to set graph type in dot file * Improved the node/edge shapes (nicer, more consistent) * Added a legend to the graph * Some refactoring and cleanup of the Graphviz generation code * Added test and fix for issue 19746 diff --git a/Modules/CMakeGraphVizOptions.cmake b/Modules/CMakeGraphVizOptions.cmake index 1911e7392e..be4a3be365 100644 --- a/Modules/CMakeGraphVizOptions.cmake +++ b/Modules/CMakeGraphVizOptions.cmake @@ -5,119 +5,145 @@ CMakeGraphVizOptions -The builtin graphviz support of CMake. +The builtin Graphviz support of CMake. -Variables specific to the graphviz support -^^ +Generating Graphviz files +^ -CMake -can generate `graphviz <http://www.graphviz.org/>`_ files, showing the dependencies between the -targets in a project and also external libraries which are linked -against. When CMake is run with the ``--graphviz=foo.dot`` option, it will -produce: +CMake can generate `Graphviz <https://www.graphviz.org/>`_ files showing the +dependencies between the targets in a project, as well as external libraries +which are linked against. -* a ``foo.dot`` file showing all dependencies in the project -* a ``foo.dot.`` file for each target, file showing on which other targets the respective target depends -* a ``foo.dot..dependers`` file, showing which other targets depend on the respective target +When running CMake with the ``--graphviz=foo.dot`` option, it produces: -The different dependency types ``PUBLIC``, ``PRIVATE`` and ``INTERFACE`` -are represented as solid, dashed and dotted edges. +* a ``foo.dot`` file, showing all dependencies in the project +* a ``foo.dot.`` file fo
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-113-gea048ed66c
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 ea048ed66c488a57ff1fe4477e07b489bf235972 (commit) via b903092b31389e21ff74dfccd4cbd7d9deeb7c22 (commit) via 0e436c573c52add744f0ff7c8845be9c7ff381a0 (commit) via 89ff3ee779f54e982e96b21b7d370371e639cc6f (commit) from 095fc6d9d96bf9f12770f85ebf0b75d384a7d5fb (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=ea048ed66c488a57ff1fe4477e07b489bf235972 commit ea048ed66c488a57ff1fe4477e07b489bf235972 Merge: b903092b31 0e436c573c Author: Brad King AuthorDate: Thu Oct 17 17:51:33 2019 + Commit: Kitware Robot CommitDate: Thu Oct 17 13:52:00 2019 -0400 Merge topic 'export-target-lang-name' 0e436c573c install,export: Do not treat language names as target names Acked-by: Kitware Robot Merge-request: !3927 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b903092b31389e21ff74dfccd4cbd7d9deeb7c22 commit b903092b31389e21ff74dfccd4cbd7d9deeb7c22 Merge: 095fc6d9d9 89ff3ee779 Author: Brad King AuthorDate: Thu Oct 17 17:51:00 2019 + Commit: Kitware Robot CommitDate: Thu Oct 17 13:51:11 2019 -0400 Merge topic 'vs_dotnet_documentation_file' 89ff3ee779 VS: Add VS_DOTNET_DOCUMENTATION_FILE property Acked-by: Kitware Robot Merge-request: !3879 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e436c573c52add744f0ff7c8845be9c7ff381a0 commit 0e436c573c52add744f0ff7c8845be9c7ff381a0 Author: Brad King AuthorDate: Wed Oct 16 12:03:41 2019 -0400 Commit: Brad King CommitDate: Wed Oct 16 12:48:20 2019 -0400 install,export: Do not treat language names as target names When generating `IMPORTED_LINK_INTERFACE_LANGUAGES`, do not treat the entries as target names. Fixes: #19846 diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 3d7eccc315..aeef602bf6 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -752,9 +752,9 @@ void cmExportFileGenerator::SetImportLinkInterface( if (iface->ImplementationIsInterface) { // Policy CMP0022 must not be NEW. -this->SetImportLinkProperty(suffix, target, -"IMPORTED_LINK_INTERFACE_LIBRARIES", -iface->Libraries, properties, missingTargets); +this->SetImportLinkProperty( + suffix, target, "IMPORTED_LINK_INTERFACE_LIBRARIES", iface->Libraries, + properties, missingTargets, ImportLinkPropertyTargetNames::Yes); return; } @@ -832,14 +832,14 @@ void cmExportFileGenerator::SetImportDetailProperties( // Add the transitive link dependencies for this configuration. if (cmLinkInterface const* iface = target->GetLinkInterface(config, target)) { -this->SetImportLinkProperty(suffix, target, -"IMPORTED_LINK_INTERFACE_LANGUAGES", -iface->Languages, properties, missingTargets); +this->SetImportLinkProperty( + suffix, target, "IMPORTED_LINK_INTERFACE_LANGUAGES", iface->Languages, + properties, missingTargets, ImportLinkPropertyTargetNames::No); std::vector dummy; -this->SetImportLinkProperty(suffix, target, -"IMPORTED_LINK_DEPENDENT_LIBRARIES", -iface->SharedDeps, properties, dummy); +this->SetImportLinkProperty( + suffix, target, "IMPORTED_LINK_DEPENDENT_LIBRARIES", iface->SharedDeps, + properties, dummy, ImportLinkPropertyTargetNames::Yes); if (iface->Multiplicity > 0) { std::string prop = cmStrCat("IMPORTED_LINK_INTERFACE_MULTIPLICITY", suffix); @@ -880,7 +880,8 @@ template void cmExportFileGenerator::SetImportLinkProperty( std::string const& suffix, cmGeneratorTarget* target, const std::string& propName, std::vector const& entries, - ImportPropertyMap& properties, std::vector& missingTargets) + ImportPropertyMap& properties, std::vector& missingTargets, + ImportLinkPropertyTargetNames targetNames) { // Skip the property if there are no entries. if (entries.empty()) { @@ -895,9 +896,13 @@ void cmExportFileGenerator::SetImportLinkProperty( link_entries += sep; sep = ";"; -std::string temp = asString(l); -this->AddTargetNamespace(temp, target, missingTargets); -link_entries += temp; +if (targetNames == ImportLinkPropertyTargetNames::Ye
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-109-g095fc6d9d9
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 095fc6d9d96bf9f12770f85ebf0b75d384a7d5fb (commit) from e60412b63ed4665559c89e4f39a71973dd41a61a (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=095fc6d9d96bf9f12770f85ebf0b75d384a7d5fb commit 095fc6d9d96bf9f12770f85ebf0b75d384a7d5fb Author: Kitware Robot AuthorDate: Thu Oct 17 00:01:09 2019 -0400 Commit: Kitware Robot CommitDate: Thu Oct 17 00:01:09 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4edadd8e06..c15eda7281 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191016) +set(CMake_VERSION_PATCH 20191017) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc1-41-gc2a7729
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, release has been updated via c2a7729177fa62a4a8eb3e2f7385f3f517c42f91 (commit) via a7ef28b9d8b30b7d5249ade425a9cd2e267da68c (commit) from 3658f4425a8ba10761682b5db323ab45650f230b (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 - --- Summary of changes: Help/command/LINK_OPTIONS_LINKER.txt | 18 +- Help/command/OPTIONS_SHELL.txt | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-108-ge60412b
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 e60412b63ed4665559c89e4f39a71973dd41a61a (commit) via 4116d5104e9b4aa5ad5ce8ab412d2230a6a62dbf (commit) via c2a7729177fa62a4a8eb3e2f7385f3f517c42f91 (commit) via a7ef28b9d8b30b7d5249ade425a9cd2e267da68c (commit) from 96a93a7f6436681d1d196de84b95ad38d88a8aaa (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=e60412b63ed4665559c89e4f39a71973dd41a61a commit e60412b63ed4665559c89e4f39a71973dd41a61a Merge: 4116d51 c2a7729 Author: Brad King AuthorDate: Wed Oct 16 10:24:00 2019 -0400 Commit: Brad King CommitDate: Wed Oct 16 10:24:00 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4116d5104e9b4aa5ad5ce8ab412d2230a6a62dbf commit 4116d5104e9b4aa5ad5ce8ab412d2230a6a62dbf Merge: 96a93a7 a7ef28b Author: Brad King AuthorDate: Wed Oct 16 14:23:12 2019 + Commit: Kitware Robot CommitDate: Wed Oct 16 10:23:22 2019 -0400 Merge topic 'doc-add_link_options-typos' a7ef28b9d8 Help: Fix typos and style in add_link_options documentation Acked-by: Kitware Robot Merge-request: !3922 --- Summary of changes: Help/command/LINK_OPTIONS_LINKER.txt | 18 +- Help/command/OPTIONS_SHELL.txt | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-104-g96a93a7
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 96a93a7f6436681d1d196de84b95ad38d88a8aaa (commit) via 3658f4425a8ba10761682b5db323ab45650f230b (commit) via 080163a6574c6fcdcdb1b194dbd85778ff5a0b66 (commit) via c3c751e9ddb06702c9a046ab2c0eda12750d09ed (commit) via c89794feaeec7c7acd22caee9c20252bfc7b33d9 (commit) from 0e5a3ae7a9161628ff0de65a31cc1a870803fc17 (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=96a93a7f6436681d1d196de84b95ad38d88a8aaa commit 96a93a7f6436681d1d196de84b95ad38d88a8aaa Merge: 0e5a3ae 3658f44 Author: Brad King AuthorDate: Wed Oct 16 09:53:14 2019 -0400 Commit: Brad King CommitDate: Wed Oct 16 09:53:14 2019 -0400 Merge branch 'release-3.16' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc1-39-g3658f44
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, release has been updated via 3658f4425a8ba10761682b5db323ab45650f230b (commit) via 466ad466b44561c8d48360fed0e491b3c09313be (commit) via 080163a6574c6fcdcdb1b194dbd85778ff5a0b66 (commit) via c3c751e9ddb06702c9a046ab2c0eda12750d09ed (commit) via c89794feaeec7c7acd22caee9c20252bfc7b33d9 (commit) via f0da223ff0ddd2b1dcc5112d7df920b23515cbd3 (commit) via 9fc87ef2e712eda340457811a1e1ac0af3e70bb5 (commit) via 08f4b5dcf9243754a3b6f88fc61d0c99578b08f6 (commit) via cd6f0ef35a9a7669e95219684f3a8398932a1b4d (commit) from 4041f6a3273f5638c28c7c9ff48f0326088531c7 (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 - --- Summary of changes: Modules/CMakeFindBinUtils.cmake | 12 Modules/FindCurses.cmake| 6 -- Modules/FindHDF5.cmake | 4 ++-- Source/cmCoreTryCompile.cxx | 3 +++ 4 files changed, 9 insertions(+), 16 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-99-g0e5a3ae
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 0e5a3ae7a9161628ff0de65a31cc1a870803fc17 (commit) via 93b80638ce9d034e9574c526aa5378ea4fc8801e (commit) via e0e109611a7c22ea4fe80cac38ba495ec19d1e07 (commit) via 4abdb1900aa47d714633f8ec9576d76781ee2f79 (commit) via 2e133ca30b46d0d189d4ced92d2794e2fccf78db (commit) via c11e7c5c3d5c5e682adf761c4b0de734ff68e690 (commit) via 466ad466b44561c8d48360fed0e491b3c09313be (commit) via f0da223ff0ddd2b1dcc5112d7df920b23515cbd3 (commit) via 9fc87ef2e712eda340457811a1e1ac0af3e70bb5 (commit) via 08f4b5dcf9243754a3b6f88fc61d0c99578b08f6 (commit) via cd6f0ef35a9a7669e95219684f3a8398932a1b4d (commit) from 220d5995076f794e222c882963fb634169a6600b (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=0e5a3ae7a9161628ff0de65a31cc1a870803fc17 commit 0e5a3ae7a9161628ff0de65a31cc1a870803fc17 Merge: 93b8063 c11e7c5 Author: Brad King AuthorDate: Wed Oct 16 13:51:24 2019 + Commit: Kitware Robot CommitDate: Wed Oct 16 09:51:32 2019 -0400 Merge topic 'FindCURL-cmake-package' c11e7c5c3d FindCURL: Try to find CURLConfig.cmake Acked-by: Kitware Robot Merge-request: !3903 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93b80638ce9d034e9574c526aa5378ea4fc8801e commit 93b80638ce9d034e9574c526aa5378ea4fc8801e Merge: e0e1096 f0da223 Author: Brad King AuthorDate: Wed Oct 16 13:43:16 2019 + Commit: Kitware Robot CommitDate: Wed Oct 16 09:45:59 2019 -0400 Merge topic 'CMakeFindBinUtils-cleanup' f0da223ff0 CMakeFindBinUtils: Remove unnecessary variable unset calls Acked-by: Kitware Robot Merge-request: !3920 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0e109611a7c22ea4fe80cac38ba495ec19d1e07 commit e0e109611a7c22ea4fe80cac38ba495ec19d1e07 Merge: 4abdb19 466ad46 Author: Brad King AuthorDate: Wed Oct 16 13:43:26 2019 + Commit: Kitware Robot CommitDate: Wed Oct 16 09:45:11 2019 -0400 Merge topic 'swift-cross-compile' 466ad466b4 try_compile: support Swift for cross-compilation Acked-by: Kitware Robot Merge-request: !3921 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4abdb1900aa47d714633f8ec9576d76781ee2f79 commit 4abdb1900aa47d714633f8ec9576d76781ee2f79 Merge: 2e133ca 9fc87ef Author: Brad King AuthorDate: Wed Oct 16 13:43:11 2019 + Commit: Kitware Robot CommitDate: Wed Oct 16 09:44:08 2019 -0400 Merge topic 'FindCurses-tinfow' 9fc87ef2e7 FindCurses: use tinfow when wide support is requested Acked-by: Kitware Robot Merge-request: !3915 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e133ca30b46d0d189d4ced92d2794e2fccf78db commit 2e133ca30b46d0d189d4ced92d2794e2fccf78db Merge: 220d599 08f4b5d Author: Brad King AuthorDate: Wed Oct 16 13:43:04 2019 + Commit: Kitware Robot CommitDate: Wed Oct 16 09:43:12 2019 -0400 Merge topic 'FindHDF5-cray' 08f4b5dcf9 FindHDF5: Append hdf5 to hdf5_hl to avoid undefined references cd6f0ef35a FindHDF5: Cray HDF5 Fortran module filename is usually capitalized Acked-by: Kitware Robot Merge-request: !3918 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c11e7c5c3d5c5e682adf761c4b0de734ff68e690 commit c11e7c5c3d5c5e682adf761c4b0de734ff68e690 Author: Charles Barto AuthorDate: Thu Oct 10 16:29:00 2019 -0700 Commit: Brad King CommitDate: Tue Oct 15 13:56:28 2019 -0400 FindCURL: Try to find CURLConfig.cmake diff --git a/Help/release/dev/FindCURL-cmake-package.rst b/Help/release/dev/FindCURL-cmake-package.rst new file mode 100644 index 000..67c5bbc --- /dev/null +++ b/Help/release/dev/FindCURL-cmake-package.rst @@ -0,0 +1,7 @@ +FindCURL-cmake-package +-- + +* The :module:`FindCURL` module learned to find CURL using + the ``CURLConfig.cmake`` package configuration file generated by + CURL's cmake buildsystem. It also gained a new ``CURL_NO_CURL_CMAKE`` + option to disable this behavior. diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake index aeebc84..919babc 100644 --- a/Modules/FindCURL.cmake +++ b/Modules/FindCURL.cmake @@ -37,8 +37,35 @@ This module defines the following variables: ``CURL_VERSION_STRING`` The version of ``curl`` found. + +CURL CMake +^^ + +If CURL was built using the CMake buildsystem then it provides its own +``CURLConfig.cmake`` file for use with the :command:`find_package` command's +config mode. This module looks for this file and, if found, +returns i
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-88-g220d599
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 220d5995076f794e222c882963fb634169a6600b (commit) from 60509518124e715994900afa88530558b248510c (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=220d5995076f794e222c882963fb634169a6600b commit 220d5995076f794e222c882963fb634169a6600b Author: Kitware Robot AuthorDate: Wed Oct 16 00:01:08 2019 -0400 Commit: Kitware Robot CommitDate: Wed Oct 16 00:01:08 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 458cc86..4edadd8 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191015) +set(CMake_VERSION_PATCH 20191016) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-87-g6050951
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 60509518124e715994900afa88530558b248510c (commit) via cdc8d75c495b4a7c8151b0aca1f6ceb515d9135e (commit) via 4041f6a3273f5638c28c7c9ff48f0326088531c7 (commit) via dc164bccc1a5c3e3e20b8c4c1ee655e9d83d5779 (commit) via e14518ec4507b008a4a1b842bb14a8587aacf055 (commit) via fb16e0e7c05c9c227f6fb2a6ec5dbcae95b12880 (commit) via 7716be4561505118bee90d54357f83f37092b53f (commit) via 74035b0ad4eb2eccf6537d6348afeb5d63222b5d (commit) via c9d73b26b0a78fac774a549de41eee55ed4e8d7b (commit) via db5a8d78761e59d43db2b463a8f8aaa5e7d2be48 (commit) from daf6a6ba68a6fa1c5d1956f151104d903f3447cc (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=60509518124e715994900afa88530558b248510c commit 60509518124e715994900afa88530558b248510c Merge: cdc8d75 4041f6a Author: Brad King AuthorDate: Tue Oct 15 11:18:51 2019 -0400 Commit: Brad King CommitDate: Tue Oct 15 11:18:51 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdc8d75c495b4a7c8151b0aca1f6ceb515d9135e commit cdc8d75c495b4a7c8151b0aca1f6ceb515d9135e Merge: dc164bc fb16e0e Author: Brad King AuthorDate: Tue Oct 15 15:16:55 2019 + Commit: Kitware Robot CommitDate: Tue Oct 15 11:17:03 2019 -0400 Merge topic 'doc-static-lib-flags' fb16e0e7c0 Help: Clarify documentation of CMAKE_STATIC_LINKER_FLAGS Acked-by: Kitware Robot Merge-request: !3919 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc164bccc1a5c3e3e20b8c4c1ee655e9d83d5779 commit dc164bccc1a5c3e3e20b8c4c1ee655e9d83d5779 Merge: e14518e c9d73b2 Author: Brad King AuthorDate: Tue Oct 15 15:13:12 2019 + Commit: Kitware Robot CommitDate: Tue Oct 15 11:14:09 2019 -0400 Merge topic 'cmake-initial-cache-relative' c9d73b26b0 cmake: Fix relative path regression in -C Acked-by: Kitware Robot Merge-request: !3912 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e14518ec4507b008a4a1b842bb14a8587aacf055 commit e14518ec4507b008a4a1b842bb14a8587aacf055 Merge: daf6a6b db5a8d7 Author: Brad King AuthorDate: Tue Oct 15 15:13:02 2019 + Commit: Kitware Robot CommitDate: Tue Oct 15 11:13:10 2019 -0400 Merge topic 'FindOpenMP-clang-HIP-device' db5a8d7876 FindOpenMP: Add support for HIP clang device pass Acked-by: Kitware Robot Merge-request: !3911 --- Summary of changes: Help/variable/CMAKE_STATIC_LINKER_FLAGS.rst | 10 -- Help/variable/CMAKE_STATIC_LINKER_FLAGS_CONFIG.rst| 12 +--- Modules/FindOpenMP.cmake | 2 ++ Source/cmake.cxx | 2 ++ Tests/RunCMake/CommandLine/C-no-file-stderr.txt | 2 +- Tests/RunCMake/CommandLine/C_basic-stderr.txt | 4 Tests/RunCMake/CommandLine/C_basic-stdout.txt | 1 + Tests/RunCMake/CommandLine/C_basic.cmake | 2 ++ Tests/RunCMake/CommandLine/C_basic_fullpath-stderr.txt| 4 Tests/RunCMake/CommandLine/C_basic_fullpath-stdout.txt| 1 + Tests/RunCMake/CommandLine/C_basic_fullpath.cmake | 2 ++ .../initial-cache.txt => C_basic_initial-cache.txt} | 1 - Tests/RunCMake/CommandLine/C_buildsrcdir-stderr.txt | 8 Tests/RunCMake/CommandLine/C_buildsrcdir-stdout.txt | 2 +- Tests/RunCMake/CommandLine/Cno-file-stderr.txt| 2 +- Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 15 --- 16 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 Tests/RunCMake/CommandLine/C_basic-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/C_basic-stdout.txt create mode 100644 Tests/RunCMake/CommandLine/C_basic.cmake create mode 100644 Tests/RunCMake/CommandLine/C_basic_fullpath-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/C_basic_fullpath-stdout.txt create mode 100644 Tests/RunCMake/CommandLine/C_basic_fullpath.cmake copy Tests/RunCMake/CommandLine/{C_buildsrcdir/initial-cache.txt => C_basic_initial-cache.txt} (76%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc1-30-g4041f6a
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, release has been updated via 4041f6a3273f5638c28c7c9ff48f0326088531c7 (commit) via fb16e0e7c05c9c227f6fb2a6ec5dbcae95b12880 (commit) via 7716be4561505118bee90d54357f83f37092b53f (commit) via 74035b0ad4eb2eccf6537d6348afeb5d63222b5d (commit) via c9d73b26b0a78fac774a549de41eee55ed4e8d7b (commit) via db5a8d78761e59d43db2b463a8f8aaa5e7d2be48 (commit) from 6847d81856be2337d24d4db04fc3d23f43122c82 (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 - --- Summary of changes: Help/variable/CMAKE_STATIC_LINKER_FLAGS.rst | 10 -- Help/variable/CMAKE_STATIC_LINKER_FLAGS_CONFIG.rst| 12 +--- Modules/FindOpenMP.cmake | 2 ++ Source/cmake.cxx | 2 ++ Tests/RunCMake/CommandLine/C-no-file-stderr.txt | 2 +- Tests/RunCMake/CommandLine/C_basic-stderr.txt | 4 Tests/RunCMake/CommandLine/C_basic-stdout.txt | 1 + Tests/RunCMake/CommandLine/C_basic.cmake | 2 ++ Tests/RunCMake/CommandLine/C_basic_fullpath-stderr.txt| 4 Tests/RunCMake/CommandLine/C_basic_fullpath-stdout.txt| 1 + Tests/RunCMake/CommandLine/C_basic_fullpath.cmake | 2 ++ .../initial-cache.txt => C_basic_initial-cache.txt} | 1 - Tests/RunCMake/CommandLine/C_buildsrcdir-stderr.txt | 8 Tests/RunCMake/CommandLine/C_buildsrcdir-stdout.txt | 2 +- Tests/RunCMake/CommandLine/Cno-file-stderr.txt| 2 +- Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 15 --- 16 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 Tests/RunCMake/CommandLine/C_basic-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/C_basic-stdout.txt create mode 100644 Tests/RunCMake/CommandLine/C_basic.cmake create mode 100644 Tests/RunCMake/CommandLine/C_basic_fullpath-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/C_basic_fullpath-stdout.txt create mode 100644 Tests/RunCMake/CommandLine/C_basic_fullpath.cmake copy Tests/RunCMake/CommandLine/{C_buildsrcdir/initial-cache.txt => C_basic_initial-cache.txt} (76%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-77-gdaf6a6b
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 daf6a6ba68a6fa1c5d1956f151104d903f3447cc (commit) from 30f0319e7f11f299cbe113b2c4db9f9c9a6ea21c (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=daf6a6ba68a6fa1c5d1956f151104d903f3447cc commit daf6a6ba68a6fa1c5d1956f151104d903f3447cc Author: Kitware Robot AuthorDate: Tue Oct 15 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Tue Oct 15 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 32b7686..458cc86 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191014) +set(CMake_VERSION_PATCH 20191015) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-76-g30f0319
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 30f0319e7f11f299cbe113b2c4db9f9c9a6ea21c (commit) from 25eef45f16aa2046071d847d93314f3b843c870d (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=30f0319e7f11f299cbe113b2c4db9f9c9a6ea21c commit 30f0319e7f11f299cbe113b2c4db9f9c9a6ea21c Author: Kitware Robot AuthorDate: Mon Oct 14 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Mon Oct 14 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1d575ba..32b7686 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191013) +set(CMake_VERSION_PATCH 20191014) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-75-g25eef45
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 25eef45f16aa2046071d847d93314f3b843c870d (commit) via 7cf79f44195a86a907dba770f1f7a361d00e77c2 (commit) via 5bf85e25178f5d9f19d2f30cf66f088c21e1114a (commit) via aa59badd6f1ab3c40d3674c26e1e55271d25225c (commit) via 7c579f0a03266e37bc0fcaaad4e3322068f65fdd (commit) via 4b021bd3e9f0d8b5ab5f8a8dc961441a7a063e25 (commit) from 001a1d2686243698527d59a9e5d00287a259 (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=25eef45f16aa2046071d847d93314f3b843c870d commit 25eef45f16aa2046071d847d93314f3b843c870d Merge: 001a1d2 7cf79f4 Author: Craig Scott AuthorDate: Sun Oct 13 21:08:23 2019 + Commit: Kitware Robot CommitDate: Sun Oct 13 17:08:44 2019 -0400 Merge topic 'feature/CMAKE_MESSAGE_CONTEXT' 7cf79f4419 message: Support logging a context with each message 5bf85e2517 message: Add new CMAKE_MESSAGE_LOG_LEVEL variable aa59badd6f Tests: Message log level tests must fail on unwanted output 7c579f0a03 Help: Move CMAKE_MESSAGE_INDENT variable to correct section 4b021bd3e9 message: Minor refactor to make code less verbose Acked-by: Kitware Robot Merge-request: !3680 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cf79f44195a86a907dba770f1f7a361d00e77c2 commit 7cf79f44195a86a907dba770f1f7a361d00e77c2 Author: Alex Turbov AuthorDate: Sat Oct 12 13:37:15 2019 +1100 Commit: Craig Scott CommitDate: Sat Oct 12 18:21:36 2019 +1100 message: Support logging a context with each message diff --git a/Help/command/message.rst b/Help/command/message.rst index 1acf30a..beb820a 100644 --- a/Help/command/message.rst +++ b/Help/command/message.rst @@ -63,11 +63,22 @@ To make a log level persist between CMake runs, the :variable:`CMAKE_MESSAGE_LOG_LEVEL` variable can be set instead. Note that the command line option takes precedence over the cache variable. -Messages of log levels ``NOTICE`` and below will also have each line preceded +Messages of log levels ``NOTICE`` and below will have each line preceded by the content of the :variable:`CMAKE_MESSAGE_INDENT` variable (converted to a single string by concatenating its list items). For ``STATUS`` to ``TRACE`` messages, this indenting content will be inserted after the hyphens. +Messages of log levels ``NOTICE`` and below can also have each line preceded +with context of the form ``[some.context.example]``. The content between the +square brackets is obtained by converting the :variable:`CMAKE_MESSAGE_CONTEXT` +list variable to a dot-separated string. The message context will always +appear before any indenting content but after any automatically added leading +hyphens. By default, message context is not shown, it has to be explicitly +enabled by giving the :manual:`cmake ` ``--log-context`` +command-line option or by setting the :variable:`CMAKE_MESSAGE_CONTEXT_SHOW` +variable to true. See the :variable:`CMAKE_MESSAGE_CONTEXT` documentation for +usage examples. + CMake Warning and Error message text displays using a simple markup language. Non-indented text is formatted in line-wrapped paragraphs delimited by newlines. Indented text is considered pre-formatted. diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 782a0f0..cad0df6 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -204,6 +204,8 @@ Variables that Change Behavior /variable/CMAKE_LINK_DIRECTORIES_BEFORE /variable/CMAKE_MFC_FLAG /variable/CMAKE_MAXIMUM_RECURSION_DEPTH + /variable/CMAKE_MESSAGE_CONTEXT + /variable/CMAKE_MESSAGE_CONTEXT_SHOW /variable/CMAKE_MESSAGE_INDENT /variable/CMAKE_MESSAGE_LOG_LEVEL /variable/CMAKE_MODULE_PATH diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 08b7534..71110d1 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -214,6 +214,16 @@ Options For backward compatibility reasons, ``--loglevel`` is also accepted as a synonym for this option. +``--log-context`` + Enable the :command:`message` command outputting context attached to each + message. + + This option turns on showing context for the current CMake run only. + To make showing the context persistent for all subsequent CMake runs, set + :variable:`CMAKE_MESSAGE_CONTEXT_SHOW` as a cache variable instead. + When this command line option is given, :variable:`CMAKE_MESSAGE_CONTEXT_SHOW` + is ignored. + ``--debug-trycompile`` Do not delete the :command:`try_compile` build tree. Only useful on on
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-69-g001a1d2
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 001a1d2686243698527d59a9e5d00287a259 (commit) from 3008d6988c08b7defe8029fee617e95860649230 (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=001a1d2686243698527d59a9e5d00287a259 commit 001a1d2686243698527d59a9e5d00287a259 Author: Kitware Robot AuthorDate: Sun Oct 13 00:01:09 2019 -0400 Commit: Kitware Robot CommitDate: Sun Oct 13 00:01:09 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d6afa4b..1d575ba 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191012) +set(CMake_VERSION_PATCH 20191013) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc1-68-g3008d69
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 3008d6988c08b7defe8029fee617e95860649230 (commit) via 07d15d70d2dcb74a2b53e4550cbde2e46dcdc266 (commit) via 0a52bada333ca968f6eef36076fe2df3f5cef051 (commit) via 3f10e564e04f1c619fcdc2c2fd4584961c46f9ec (commit) via 04ad7b8571f369e45feaba50941e20d082aa7b17 (commit) via e13df96d26a7c10d2d10248f1695ebefaab5391d (commit) via 576424f89adbf49de59a52bfe483994ce06f5b28 (commit) via 7676966f997a22549b1a45ebedca566bb278acdb (commit) via 6847d81856be2337d24d4db04fc3d23f43122c82 (commit) via 874396a30d8dc85d45176de4ec53dc951179010e (commit) via b254b0651ef093476322165f919e0a930534473b (commit) via 75f361a00c09d223bf2b0384155ef7804922a1ff (commit) via 83dbef11352c0075bf0c6c504f0094457b352051 (commit) via ecbf6546d7b4b28ddda40649ecf9d7a4cbe12dcc (commit) via 2eecd1c3bce761510f7090629c807a93e3742b1e (commit) via 820f9523169bf3de75b2042c241457d8f7a73d74 (commit) via 881bca249defc148bc98d3caa9799f34536dd256 (commit) via d26ef5d807917ddaafac83c50d251379d822d060 (commit) via ec43d96657d3cc5d3a54555c6cbd0c1619c787ca (commit) via 908dff41c6a8fc98c77d40c5f3b4e7c34ee46c3d (commit) via 18f3e286521437adc3f231cc126833bdcd2c5807 (commit) via 5652e11ea1543a9d3038bf104607bf13feb5582a (commit) via 6e51db9a40cda01907322da384a84bf5c4237231 (commit) via 3709389520f091de10e2c1b7fb8350bacc3a0fb0 (commit) via 3e05637280e77d991f2270d13cead0343b13d029 (commit) via 13c8dbd5a6bede4f3455203958238165437396e9 (commit) via ed06d27c7f0503a7d0d32d352d2e31bd4b82070e (commit) via 1d9155eb9351120eadfa7d6386d0625b076d4be2 (commit) via 806e01d638195905b1973c031ef71a4125f50376 (commit) via 8aac65a3614646073904b41baa4a57e5db28fcec (commit) from b727e74fb0c6bd05a0e03ab08a5d38fac906c5e1 (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=3008d6988c08b7defe8029fee617e95860649230 commit 3008d6988c08b7defe8029fee617e95860649230 Merge: 07d15d7 6847d81 Author: Brad King AuthorDate: Sat Oct 12 10:30:48 2019 -0400 Commit: Brad King CommitDate: Sat Oct 12 10:30:48 2019 -0400 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07d15d70d2dcb74a2b53e4550cbde2e46dcdc266 commit 07d15d70d2dcb74a2b53e4550cbde2e46dcdc266 Merge: 0a52bad 874396a Author: Brad King AuthorDate: Sat Oct 12 14:29:10 2019 + Commit: Kitware Robot CommitDate: Sat Oct 12 10:29:19 2019 -0400 Merge topic 'no-git-version' 874396a30d CMakeVersion: Add option to disable Git suffix b254b0651e CMakeVersion: Prefer Git information provided by 'git archive' exports Acked-by: Kitware Robot Merge-request: !3910 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a52bada333ca968f6eef36076fe2df3f5cef051 commit 0a52bada333ca968f6eef36076fe2df3f5cef051 Merge: 3f10e56 ec43d96 Author: Brad King AuthorDate: Sat Oct 12 14:26:52 2019 + Commit: Kitware Robot CommitDate: Sat Oct 12 10:28:05 2019 -0400 Merge topic 'FindPostgreSQL-macports-and-v12' ec43d96657 FindPostgreSQL: support macports installation scheme 908dff41c6 FindPostgreSQL: support version 12 Acked-by: Kitware Robot Merge-request: !3907 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f10e564e04f1c619fcdc2c2fd4584961c46f9ec commit 3f10e564e04f1c619fcdc2c2fd4584961c46f9ec Merge: 04ad7b8 5652e11 Author: Brad King AuthorDate: Sat Oct 12 14:26:42 2019 + Commit: Kitware Robot CommitDate: Sat Oct 12 10:27:06 2019 -0400 Merge topic 'iar-8051-support' 5652e11ea1 IAR: Add 8051 support 6e51db9a40 IAR: Fix v850 assembler support file extensions Acked-by: Kitware Robot Merge-request: !3906 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04ad7b8571f369e45feaba50941e20d082aa7b17 commit 04ad7b8571f369e45feaba50941e20d082aa7b17 Merge: e13df96 806e01d Author: Brad King AuthorDate: Sat Oct 12 14:25:35 2019 + Commit: Kitware Robot CommitDate: Sat Oct 12 10:26:13 2019 -0400 Merge topic 'objc-c++flags' 806e01d638 Objective-C: Do not treat Objective-C files as C++ files Acked-by: Kitware Robot Merge-request: !3904 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e13df96d26a7c10d2d10248f1695ebefaab5391d commit e13df96d26a7c10d2d10248f1695ebefaab5391d Merge: 576424f 13c8dbd Author: Brad King AuthorDate: Sat Oct 12 14:24:51 2019 + Commit: Kit