[Cmake-commits] CMake branch, master, updated. v3.16.0-428-gf7ca8fc24c
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 f7ca8fc24ccb4e7724d2228d9997b2df99e71133 (commit) from c57bcf3b3025875dfbfd1d1f6eca1291abf4d2f7 (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=f7ca8fc24ccb4e7724d2228d9997b2df99e71133 commit f7ca8fc24ccb4e7724d2228d9997b2df99e71133 Author: Kitware Robot AuthorDate: Wed Dec 4 00:01:08 2019 -0500 Commit: Kitware Robot CommitDate: Wed Dec 4 00:01:08 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f337884b4c..828c9652af 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 20191203) +set(CMake_VERSION_PATCH 20191204) #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-427-gc57bcf3b30
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 c57bcf3b3025875dfbfd1d1f6eca1291abf4d2f7 (commit) from 735d731119e731c8a321f85824ee685005b38731 (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=c57bcf3b3025875dfbfd1d1f6eca1291abf4d2f7 commit c57bcf3b3025875dfbfd1d1f6eca1291abf4d2f7 Author: Kitware Robot AuthorDate: Tue Dec 3 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Tue Dec 3 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 97a182fdac..f337884b4c 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 20191202) +set(CMake_VERSION_PATCH 20191203) #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-426-g735d731119
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 735d731119e731c8a321f85824ee685005b38731 (commit) from ff270b8d337bd3fe7b95587c87e261b7f5893ea4 (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=735d731119e731c8a321f85824ee685005b38731 commit 735d731119e731c8a321f85824ee685005b38731 Author: Kitware Robot AuthorDate: Mon Dec 2 00:01:08 2019 -0500 Commit: Kitware Robot CommitDate: Mon Dec 2 00:01:08 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 589666e610..97a182fdac 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 20191201) +set(CMake_VERSION_PATCH 20191202) #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-425-gff270b8d33
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 ff270b8d337bd3fe7b95587c87e261b7f5893ea4 (commit) from 7cd0c2be0154436ec459829dcc1eee192586e486 (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=ff270b8d337bd3fe7b95587c87e261b7f5893ea4 commit ff270b8d337bd3fe7b95587c87e261b7f5893ea4 Author: Kitware Robot AuthorDate: Sun Dec 1 00:01:06 2019 -0500 Commit: Kitware Robot CommitDate: Sun Dec 1 00:01:06 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1b333c9566..589666e610 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 20191130) +set(CMake_VERSION_PATCH 20191201) #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-424-g7cd0c2be01
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 7cd0c2be0154436ec459829dcc1eee192586e486 (commit) from ca2a3929c2c7d479b12bab96d1910eff87380861 (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=7cd0c2be0154436ec459829dcc1eee192586e486 commit 7cd0c2be0154436ec459829dcc1eee192586e486 Author: Kitware Robot AuthorDate: Sat Nov 30 00:01:09 2019 -0500 Commit: Kitware Robot CommitDate: Sat Nov 30 00:01:09 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4d44e09aed..1b333c9566 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 20191129) +set(CMake_VERSION_PATCH 20191130) #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-423-gca2a3929c2
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 ca2a3929c2c7d479b12bab96d1910eff87380861 (commit) from 7fe99b813c6772f056fddc2c6ea7f73ccb3d3e1c (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=ca2a3929c2c7d479b12bab96d1910eff87380861 commit ca2a3929c2c7d479b12bab96d1910eff87380861 Author: Kitware Robot AuthorDate: Fri Nov 29 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Fri Nov 29 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1e2e078ac0..4d44e09aed 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 20191128) +set(CMake_VERSION_PATCH 20191129) #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-422-g7fe99b813c
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 7fe99b813c6772f056fddc2c6ea7f73ccb3d3e1c (commit) from 53bc2000a4dc5296338f5997497c8f1d435fc259 (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=7fe99b813c6772f056fddc2c6ea7f73ccb3d3e1c commit 7fe99b813c6772f056fddc2c6ea7f73ccb3d3e1c Author: Kitware Robot AuthorDate: Thu Nov 28 00:01:11 2019 -0500 Commit: Kitware Robot CommitDate: Thu Nov 28 00:01:11 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4bf7bcf825..1e2e078ac0 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 20191127) +set(CMake_VERSION_PATCH 20191128) #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-2-g85fb95562b
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 85fb95562bb7f04664f0b47d20f248c9779ff61f (commit)
via 59df85194e47ea330478410092ddb9c6fcb17163 (commit)
from 1b4482f65dd41f21ec8abc0777b8dc1f0381bbd6 (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/CMakeLib/testCTestResourceSpec.cxx | 1 +
Tests/CMakeLib/testCTestResourceSpec_data/{spec19.json => spec36.json} | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec19.json => spec36.json}
(56%)
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-421-g53bc2000a4
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 53bc2000a4dc5296338f5997497c8f1d435fc259 (commit)
via 398dfc1338eb2ccd98ae5513fe6ebeb019cf7bcd (commit)
via 85fb95562bb7f04664f0b47d20f248c9779ff61f (commit)
via 59df85194e47ea330478410092ddb9c6fcb17163 (commit)
from 7046a5219893436cbe19b6973ac13fb489199601 (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=53bc2000a4dc5296338f5997497c8f1d435fc259
commit 53bc2000a4dc5296338f5997497c8f1d435fc259
Merge: 398dfc1338 85fb95562b
Author: Kyle Edwards
AuthorDate: Thu Nov 28 03:48:08 2019 +
Commit: Kitware Robot
CommitDate: Wed Nov 27 22:48:20 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=398dfc1338eb2ccd98ae5513fe6ebeb019cf7bcd
commit 398dfc1338eb2ccd98ae5513fe6ebeb019cf7bcd
Merge: 7046a52198 59df85194e
Author: Kyle Edwards
AuthorDate: Thu Nov 28 03:48:08 2019 +
Commit: Kitware Robot
CommitDate: Wed Nov 27 22:48:20 2019 -0500
Merge topic 'ctest-spec-file-version-test'
59df85194e CTest Resource Allocation: Add test for spec file with no version
Acked-by: Kitware Robot
Merge-request: !4092
---
Summary of changes:
Tests/CMakeLib/testCTestResourceSpec.cxx | 1 +
Tests/CMakeLib/testCTestResourceSpec_data/{spec19.json => spec36.json} | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec19.json => spec36.json}
(56%)
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-417-g7046a52198
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 7046a5219893436cbe19b6973ac13fb489199601 (commit) from ffe801062a63387b2c109eda034d74830d72a4ce (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=7046a5219893436cbe19b6973ac13fb489199601 commit 7046a5219893436cbe19b6973ac13fb489199601 Author: Kitware Robot AuthorDate: Wed Nov 27 00:01:12 2019 -0500 Commit: Kitware Robot CommitDate: Wed Nov 27 00:01:12 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 249727851b..4bf7bcf825 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 20191126) +set(CMake_VERSION_PATCH 20191127) #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, created. v3.16.0
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 has been created at 24176cbf3f521c8e6704e9d9746ed42537527ade (tag) tagging 1b4482f65dd41f21ec8abc0777b8dc1f0381bbd6 (commit) replaces v3.16.0-rc4 tagged by Brad King on Tue Nov 26 10:21:49 2019 -0500 - Log - CMake 3.16.0 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl3dQw0WHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhCA8EACnOAQ20KwRFXEyFmVoU0B+fsxe ViBjXjk2HTMR3obbB95vu4GZ/+0qAkqIN+rpvW//OZhpAgPYwQzwPPSVyjhAoTP8 YcEoyqs8LzMpytaE1gZPx17PCsATWni3ggYncgZwGF1UUaz5x4jYU4Of6gjWnWxQ Codq4iABZE8oZI04vOAbF2OgtSA8kPvDE0I3f1feX4HVzvJSVlhPvPlSadmqY11x hHgnVAhCDEHehdwcCIjKwtRWDoBjV7muk+Pk1AJvEQfzvhnY2TWYb6Ik0/JHaaAs eSHxMa6VIswnvn2VK5dR/Uc2Fu9eBvSQ8AbrgUPHpY95/47PmHyNAZWlJxEEWzgT Ak9Vgds1yPRg7NAnkItprV/Jsc+aDL/BxcoyuHBadcvlL75OgVV1MZQ/bOIEbZHo BwK+TnRq8D82xVP+1pnKTSYrZqV+22Lfl9VosvTnqSYxj17DHeFiuNkrCkSUOH6d wLtq2TfVtu0TpRow0ABcMhr8VGnMfYCdGYdf4UF3n1hSI96DExS4NbzQUBzd4KVj fGJehAE8+rUOgsgrjNSyfylxvnUT5jn2fQpyTywmifEYL17+nyaJY9b7hF7yKX89 O5QuvJxZI452BBl9SbM7bv9CYgp6VsIRk22epqDOpLzLB6elv7C3Vei0ZCieLYWo jT6oNjaqQJ7g/P9Ddg== =U1/L -END PGP SIGNATURE- Brad King (18): 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 Merge branch 'vs-v142-csharp-flags' into release-3.15 Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15 Merge branch 'doc-genex-tweak' into release-3.15 CMake 3.15.5 Xcode: Set source file type for Objective C/C++ Merge topic 'FindwxWidgets-qt-debug' into release-3.16 Merge topic 'xcode-objc' into release-3.16 FindwxWidgets: Fix finding both release and debug libs Merge topic 'FindwxWidgets-rel-and-dbg' into release-3.16 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output Merge topic 'unity-no-duplicate-path' into release-3.16 Merge topic 'FindODBC-mingw' into release-3.16 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR Merge topic 'implicit-includes-extra-CR' into release-3.16 Merge topic 'ctest-resource-fixes' into release-3.16 CMake 3.16.0 Craig Sturdy (1): FindwxWidgets: Find wxQt debug libraries Cristian Adam (2): Unity: No repeated path for internal generated unity files FindODBC: Add library name for MinGW toolchains Kyle Edwards (3): CTest: Add version field to resource spec file CTest: Clarify that resource requirements can be split Help: Clarify how tests are run if no resource spec file is specified --- 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-rc4-24-g1b4482f65d
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 1b4482f65dd41f21ec8abc0777b8dc1f0381bbd6 (commit) from b1175431c385cb052769d4575576ebb19b6e594b (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-rc4-440-gffe801062a
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 ffe801062a63387b2c109eda034d74830d72a4ce (commit) via 1b4482f65dd41f21ec8abc0777b8dc1f0381bbd6 (commit) from 797e55a5ef718f8762b393358c3f221c314f21d1 (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=ffe801062a63387b2c109eda034d74830d72a4ce commit ffe801062a63387b2c109eda034d74830d72a4ce Merge: 797e55a5ef 1b4482f65d Author: Brad King AuthorDate: Tue Nov 26 10:18:59 2019 -0500 Commit: Brad King CommitDate: Tue Nov 26 10:18:59 2019 -0500 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-rc4-438-g797e55a5ef
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 797e55a5ef718f8762b393358c3f221c314f21d1 (commit)
via 19f267c75e84b72c4de42570be0c4222bb93aaff (commit)
from ff198efc77e7b2401aa5cc4d7b6b7c91838dde7b (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=797e55a5ef718f8762b393358c3f221c314f21d1
commit 797e55a5ef718f8762b393358c3f221c314f21d1
Merge: ff198efc77 19f267c75e
Author: Brad King
AuthorDate: Tue Nov 26 14:14:26 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 26 09:14:33 2019 -0500
Merge topic 'xlf-ninja'
19f267c75e XL: Add support for Ninja and XL Fortran
Acked-by: Kitware Robot
Merge-request: !4075
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19f267c75e84b72c4de42570be0c4222bb93aaff
commit 19f267c75e84b72c4de42570be0c4222bb93aaff
Author: Brad King
AuthorDate: Thu Nov 21 14:38:35 2019 -0500
Commit: Brad King
CommitDate: Thu Nov 21 15:59:12 2019 -0500
XL: Add support for Ninja and XL Fortran
The Ninja generator's support for Fortran requires that source files
be preprocessed explicitly first. However, the `xlf` compiler does
not have a simple `-E` option or equivalent to do preprocessing.
The only documented way to get preprocessed output is to use `-d`
to leave it behind, but only at an inflexible location.
Instead, create our own `cpp` wrapper script and substitute it for the
real preprocessor using `-tF -B ...`. Teach the wrapper to map the
`cpp` output to the location we need and then invoke the real `cpp`
underneath.
Fixes: #19450
diff --git a/Help/release/dev/xlf-ninja.rst b/Help/release/dev/xlf-ninja.rst
new file mode 100644
index 00..916e713008
--- /dev/null
+++ b/Help/release/dev/xlf-ninja.rst
@@ -0,0 +1,5 @@
+xlf-ninja
+-
+
+* The IBM XL Fortran compiler is now supported by the :generator:`Ninja`
+ generator.
diff --git a/Modules/CMakeDetermineCompilerId.cmake
b/Modules/CMakeDetermineCompilerId.cmake
index f7ef755aeb..0b3664c5de 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -182,6 +182,10 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
message(STATUS "The ${lang} compiler identification is unknown")
endif()
+ if(lang STREQUAL "Fortran" AND CMAKE_${lang}_COMPILER_ID STREQUAL "XL")
+set(CMAKE_${lang}_XL_CPP "${CMAKE_${lang}_COMPILER_ID_CPP}" PARENT_SCOPE)
+ endif()
+
set(CMAKE_${lang}_COMPILER_ID "${CMAKE_${lang}_COMPILER_ID}" PARENT_SCOPE)
set(CMAKE_${lang}_PLATFORM_ID "${CMAKE_${lang}_PLATFORM_ID}" PARENT_SCOPE)
set(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID
"${CMAKE_${lang}_COMPILER_ARCHITECTURE_ID}" PARENT_SCOPE)
@@ -542,6 +546,12 @@ Id flags: ${testflags}
${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
ERROR_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT
RESULT_VARIABLE CMAKE_${lang}_COMPILER_ID_RESULT
)
+if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "exec:
[^\n]*\\((/[^,\n]*/cpp),CMakeFortranCompilerId.F")
+ set(_cpp "${CMAKE_MATCH_1}")
+ if(EXISTS "${_cpp}")
+set(CMAKE_${lang}_COMPILER_ID_CPP "${_cpp}" PARENT_SCOPE)
+ endif()
+endif()
endif()
# Check the result of compilation.
diff --git a/Modules/CMakeDetermineFortranCompiler.cmake
b/Modules/CMakeDetermineFortranCompiler.cmake
index 5ddd64fae8..e8505417d6 100644
--- a/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/Modules/CMakeDetermineFortranCompiler.cmake
@@ -271,6 +271,11 @@ include(CMakeFindBinUtils)
include(Compiler/${CMAKE_Fortran_COMPILER_ID}-FindBinUtils OPTIONAL)
unset(_CMAKE_PROCESSING_LANGUAGE)
+if(CMAKE_Fortran_XL_CPP)
+ set(_SET_CMAKE_Fortran_XL_CPP
+"set(CMAKE_Fortran_XL_CPP \"${CMAKE_Fortran_XL_CPP}\")")
+endif()
+
if(CMAKE_Fortran_COMPILER_ARCHITECTURE_ID)
set(_SET_CMAKE_Fortran_COMPILER_ARCHITECTURE_ID
"set(CMAKE_Fortran_COMPILER_ARCHITECTURE_ID
${CMAKE_Fortran_COMPILER_ARCHITECTURE_ID})")
diff --git a/Modules/CMakeFortranCompiler.cmake.in
b/Modules/CMakeFortranCompiler.cmake.in
index ae7b73ac4a..34f44aa542 100644
--- a/Modules/CMakeFortranCompiler.cmake.in
+++ b/Modules/CMakeFortranCompiler.cmake.in
@@ -6,6 +6,7 @@ set(CMAKE_Fortran_COMPILER_WRAPPER
"@CMAKE_Fortran_COMPILER_WRAPPER@")
set(CMAKE_Fortran_PLATFORM_ID "@CMAKE_Fortran_PLATFORM_ID@")
set(CMAKE_Fortran_SIMULATE_ID "@CMAKE_Fortran_SIMULATE_ID@
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc4-23-gb1175431c3
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 b1175431c385cb052769d4575576ebb19b6e594b (commit)
via a033bafbe01fcb4654f075955e0b3de7be81b0f7 (commit)
via a64ba0235fbacfe58751c222997bdd74cf973359 (commit)
via f9f294f5faf980aa39721e4deb465b2e9dbbbd9a (commit)
from 8db38cfe3386c463ef40af8520a5df329f9fd596 (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/ctest.1.rst| 26 ++
Help/prop_test/RESOURCE_GROUPS.rst | 16 +
Source/CTest/cmCTestResourceSpec.cxx | 26 ++
Tests/CMakeLib/testCTestResourceGroups.cxx | 3 +++
Tests/CMakeLib/testCTestResourceSpec.cxx | 17 ++
.../CMakeLib/testCTestResourceSpec_data/spec1.json | 4
.../testCTestResourceSpec_data/spec10.json | 4
.../testCTestResourceSpec_data/spec11.json | 4
.../testCTestResourceSpec_data/spec14.json | 4
.../testCTestResourceSpec_data/spec15.json | 4
.../testCTestResourceSpec_data/spec16.json | 4
.../testCTestResourceSpec_data/spec17.json | 4
.../testCTestResourceSpec_data/spec18.json | 4
.../{spec6.json => spec19.json}| 2 +-
.../CMakeLib/testCTestResourceSpec_data/spec2.json | 4
.../testCTestResourceSpec_data/spec20.json | 8 +++
.../{spec6.json => spec21.json}| 2 +-
.../{spec6.json => spec22.json}| 2 +-
.../testCTestResourceSpec_data/spec23.json | 7 ++
.../testCTestResourceSpec_data/spec24.json | 7 ++
.../testCTestResourceSpec_data/spec25.json | 8 +++
.../testCTestResourceSpec_data/spec26.json | 8 +++
.../testCTestResourceSpec_data/spec27.json | 8 +++
.../testCTestResourceSpec_data/spec28.json | 8 +++
.../testCTestResourceSpec_data/spec29.json | 5 +
.../CMakeLib/testCTestResourceSpec_data/spec3.json | 4
.../{spec6.json => spec30.json}| 2 +-
.../{spec6.json => spec31.json}| 2 +-
.../{spec6.json => spec32.json}| 2 +-
.../testCTestResourceSpec_data/spec33.json | 5 +
.../testCTestResourceSpec_data/spec34.json | 5 +
.../{spec6.json => spec35.json}| 2 +-
.../CMakeLib/testCTestResourceSpec_data/spec4.json | 4
.../CMakeLib/testCTestResourceSpec_data/spec5.json | 4
.../CMakeLib/testCTestResourceSpec_data/spec6.json | 4
.../CMakeLib/testCTestResourceSpec_data/spec7.json | 4
.../CMakeLib/testCTestResourceSpec_data/spec8.json | 4
.../CMakeLib/testCTestResourceSpec_data/spec9.json | 4
.../CTestResourceAllocation/RunCMakeTest.cmake | 2 ++
.../{notenough1.cmake => combine.cmake}| 2 +-
.../CTestResourceAllocation/notenough1.cmake | 2 +-
.../CTestResourceAllocation/notenough2.cmake | 2 +-
...ck.cmake => notenough3-ctest-s-res-check.cmake} | 0
.../notenough3-ctest-s-res-result.txt} | 0
.../notenough3-ctest-s-res-stderr.txt | 4
.../{notenough2.cmake => notenough3.cmake} | 2 +-
.../RunCMake/CTestResourceAllocation/resspec.json | 4
47 files changed, 242 insertions(+), 11 deletions(-)
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec19.json}
(56%)
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec20.json
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec21.json}
(50%)
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec22.json}
(56%)
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec23.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec24.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec25.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec26.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec27.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec28.json
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/spec29.json
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec30.json}
(53%)
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec31.json}
(50%)
copy Tests/CMakeLib/testCTestResourceSpec_data/{spec6.json => spec32.json}
(50%)
create mode 100644 Tests/CMakeLib/testCTestResourceSpec_data/s
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc4-436-gff198efc77
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 ff198efc77e7b2401aa5cc4d7b6b7c91838dde7b (commit)
via 3d5227e6b654b7c49c3d0cbc633d832104a0a7fe (commit)
via b1175431c385cb052769d4575576ebb19b6e594b (commit)
via a033bafbe01fcb4654f075955e0b3de7be81b0f7 (commit)
via eafce6c2562a76ef33c2258d2fef04aae2b4e6e9 (commit)
via 4e4327ee3cbcbb083a0a5aa44b8d932728d30d3f (commit)
via a64ba0235fbacfe58751c222997bdd74cf973359 (commit)
via f9f294f5faf980aa39721e4deb465b2e9dbbbd9a (commit)
from 8741d9e262a66de86fac6008bbf466dc25f72ec6 (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=ff198efc77e7b2401aa5cc4d7b6b7c91838dde7b
commit ff198efc77e7b2401aa5cc4d7b6b7c91838dde7b
Merge: 3d5227e6b6 b1175431c3
Author: Brad King
AuthorDate: Tue Nov 26 14:12:25 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 26 09:12:34 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d5227e6b654b7c49c3d0cbc633d832104a0a7fe
commit 3d5227e6b654b7c49c3d0cbc633d832104a0a7fe
Merge: eafce6c256 a033bafbe0
Author: Brad King
AuthorDate: Tue Nov 26 14:12:25 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 26 09:12:34 2019 -0500
Merge topic 'ctest-resource-fixes'
a033bafbe0 Help: Clarify how tests are run if no resource spec file is
specified
a64ba0235f CTest: Clarify that resource requirements can be split
f9f294f5fa CTest: Add version field to resource spec file
Acked-by: Kitware Robot
Merge-request: !4080
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eafce6c2562a76ef33c2258d2fef04aae2b4e6e9
commit eafce6c2562a76ef33c2258d2fef04aae2b4e6e9
Merge: 8741d9e262 4e4327ee3c
Author: Brad King
AuthorDate: Tue Nov 26 09:03:54 2019 -0500
Commit: Brad King
CommitDate: Tue Nov 26 09:03:54 2019 -0500
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e4327ee3cbcbb083a0a5aa44b8d932728d30d3f
commit 4e4327ee3cbcbb083a0a5aa44b8d932728d30d3f
Merge: 61ce9d1769 4b46523d90
Author: Brad King
AuthorDate: Tue Nov 26 09:03:08 2019 -0500
Commit: Brad King
CommitDate: Tue Nov 26 09:03:14 2019 -0500
Merge branch 'backport-implicit-includes-extra-CR' into release-3.15
Merge-request: !4088
---
Summary of changes:
Help/manual/ctest.1.rst| 26 ++
Help/prop_test/RESOURCE_GROUPS.rst | 16 +
Source/CTest/cmCTestResourceSpec.cxx | 26 ++
Tests/CMakeLib/testCTestResourceGroups.cxx | 3 +++
Tests/CMakeLib/testCTestResourceSpec.cxx | 17 ++
.../CMakeLib/testCTestResourceSpec_data/spec1.json | 4
.../testCTestResourceSpec_data/spec10.json | 4
.../testCTestResourceSpec_data/spec11.json | 4
.../testCTestResourceSpec_data/spec14.json | 4
.../testCTestResourceSpec_data/spec15.json | 4
.../testCTestResourceSpec_data/spec16.json | 4
.../testCTestResourceSpec_data/spec17.json | 4
.../testCTestResourceSpec_data/spec18.json | 4
.../{spec6.json => spec19.json}| 2 +-
.../CMakeLib/testCTestResourceSpec_data/spec2.json | 4
.../testCTestResourceSpec_data/spec20.json | 8 +++
.../{spec6.json => spec21.json}| 2 +-
.../{spec6.json => spec22.json}| 2 +-
.../testCTestResourceSpec_data/spec23.json | 7 ++
.../testCTestResourceSpec_data/spec24.json | 7 ++
.../testCTestResourceSpec_data/spec25.json | 8 +++
.../testCTestResourceSpec_data/spec26.json | 8 +++
.../testCTestResourceSpec_data/spec27.json | 8 +++
.../testCTestResourceSpec_data/spec28.json | 8 +++
.../testCTestResourceSpec_data/spec29.json | 5 +
.../CMakeLib/testCTestResourceSpec_data/spec3.json | 4
.../{spec6.json => spec30.json}| 2 +-
.../{spec6.json => spec31.json}| 2 +-
.../{spec6.json => spec32.json}| 2 +-
.../testCTestResourceSpec_data/spec33.json | 5 +
.../testCTestResourceSpec_data/spec34.json | 5 +
.../{spec6.json => spec35.json}| 2 +-
.../CMakeLib/testCTestResourceSpec_data/spec4.json | 4
...
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc4-19-g8db38cfe33
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 8db38cfe3386c463ef40af8520a5df329f9fd596 (commit) via 6d84afc7f2fc84f6a02402d63b40d0cce791b821 (commit) via 0cb043390b3a78d80e5cf4dbbb47df1ca8c0d993 (commit) via 557ceacf820a935bc5eaeb8637de315730dc0db6 (commit) via 4b46523d905451ebdcf0ef8476ebe875945b3a62 (commit) via cb8042b0ab1dba815423c6a236412b2adcb2b880 (commit) via 43ffd2c35caf1df37e915460c05da04b583577c4 (commit) via 2a5e5b25ba4d6eb68dbee29381774562c98e228f (commit) via 08173075c185da050f5aa58e4bd9b5fa6659c63e (commit) via 83dbef11352c0075bf0c6c504f0094457b352051 (commit) via 881bca249defc148bc98d3caa9799f34536dd256 (commit) via dec3e9363e2ced84ef4c3a3972272c27d90a8766 (commit) via ac1a1bf18bd3d395fd17eddbc5a38e710e737664 (commit) from 99f0881d8c6d0c435e595c5f9510da776827ee3e (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/CMakeParseImplicitIncludeInfo.cmake | 2 +- Modules/FindODBC.cmake | 2 ++ Source/cmLocalGenerator.cxx | 29 - 3 files changed, 19 insertions(+), 14 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-rc4-428-g8741d9e262
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 8741d9e262a66de86fac6008bbf466dc25f72ec6 (commit) via 78a85fd0696e27ada29076fc4d01b5408e5d93c2 (commit) via 8db38cfe3386c463ef40af8520a5df329f9fd596 (commit) via 6d84afc7f2fc84f6a02402d63b40d0cce791b821 (commit) via 101f7ac63df9601048234864d8daf310da22219c (commit) via 5c49f82a2d366edfe4cd86b809859fc0e4a3e7b9 (commit) via 0cb043390b3a78d80e5cf4dbbb47df1ca8c0d993 (commit) via 86356f140f4d4ee542a10f75d3bcf4cd590de900 (commit) via 557ceacf820a935bc5eaeb8637de315730dc0db6 (commit) via 7525f0ec6c87576a938b64d52e88e5b319f4a319 (commit) via 4b46523d905451ebdcf0ef8476ebe875945b3a62 (commit) via cb8042b0ab1dba815423c6a236412b2adcb2b880 (commit) via 43ffd2c35caf1df37e915460c05da04b583577c4 (commit) from bb3d82232d06e553dedd430e6d7a1d0d917108dd (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=8741d9e262a66de86fac6008bbf466dc25f72ec6 commit 8741d9e262a66de86fac6008bbf466dc25f72ec6 Merge: 78a85fd069 8db38cfe33 Author: Brad King AuthorDate: Tue Nov 26 14:02:31 2019 + Commit: Kitware Robot CommitDate: Tue Nov 26 09:02:41 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78a85fd0696e27ada29076fc4d01b5408e5d93c2 commit 78a85fd0696e27ada29076fc4d01b5408e5d93c2 Merge: 101f7ac63d 6d84afc7f2 Author: Brad King AuthorDate: Tue Nov 26 14:02:31 2019 + Commit: Kitware Robot CommitDate: Tue Nov 26 09:02:40 2019 -0500 Merge topic 'implicit-includes-extra-CR' 6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output Acked-by: Kitware Robot Merge-request: !4088 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=101f7ac63df9601048234864d8daf310da22219c commit 101f7ac63df9601048234864d8daf310da22219c Merge: 5c49f82a2d 0cb043390b Author: Brad King AuthorDate: Tue Nov 26 13:55:26 2019 + Commit: Kitware Robot CommitDate: Tue Nov 26 08:56:33 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c49f82a2d366edfe4cd86b809859fc0e4a3e7b9 commit 5c49f82a2d366edfe4cd86b809859fc0e4a3e7b9 Merge: 86356f140f cb8042b0ab Author: Brad King AuthorDate: Tue Nov 26 13:55:26 2019 + Commit: Kitware Robot CommitDate: Tue Nov 26 08:56:33 2019 -0500 Merge topic 'FindODBC-mingw' cb8042b0ab FindODBC: Add library name for MinGW toolchains Acked-by: Kitware Robot Merge-request: !4076 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86356f140f4d4ee542a10f75d3bcf4cd590de900 commit 86356f140f4d4ee542a10f75d3bcf4cd590de900 Merge: 7525f0ec6c 557ceacf82 Author: Brad King AuthorDate: Tue Nov 26 13:54:54 2019 + Commit: Kitware Robot CommitDate: Tue Nov 26 08:55:09 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7525f0ec6c87576a938b64d52e88e5b319f4a319 commit 7525f0ec6c87576a938b64d52e88e5b319f4a319 Merge: bb3d82232d 43ffd2c35c Author: Brad King AuthorDate: Tue Nov 26 13:54:54 2019 + Commit: Kitware Robot CommitDate: Tue Nov 26 08:55:09 2019 -0500 Merge topic 'unity-no-duplicate-path' 43ffd2c35c Unity: No repeated path for internal generated unity files Acked-by: Kitware Robot Merge-request: !4077 --- Summary of changes: Modules/CMakeParseImplicitIncludeInfo.cmake | 2 +- Modules/FindODBC.cmake | 2 ++ Source/cmLocalGenerator.cxx | 29 - 3 files changed, 19 insertions(+), 14 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-rc4-415-gbb3d82232d
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 bb3d82232d06e553dedd430e6d7a1d0d917108dd (commit) from e17934c1834ef249107ba5fd46d5e6c2c9017534 (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=bb3d82232d06e553dedd430e6d7a1d0d917108dd commit bb3d82232d06e553dedd430e6d7a1d0d917108dd Author: Kitware Robot AuthorDate: Tue Nov 26 00:01:10 2019 -0500 Commit: Kitware Robot CommitDate: Tue Nov 26 00:01:10 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d8e44f686d..249727851b 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 20191125) +set(CMake_VERSION_PATCH 20191126) #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-rc4-414-ge17934c183
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 e17934c1834ef249107ba5fd46d5e6c2c9017534 (commit)
via 5129e97285339ad0a481ffdd148bb9e09848a2f4 (commit)
from 58da842063cc80e34ce3ae16aa8c5fb16cdc29dd (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=e17934c1834ef249107ba5fd46d5e6c2c9017534
commit e17934c1834ef249107ba5fd46d5e6c2c9017534
Merge: 58da842063 5129e97285
Author: Brad King
AuthorDate: Mon Nov 25 15:52:55 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 25 10:53:13 2019 -0500
Merge topic 'git-var'
5129e97285 setup-user: switch to git-var to check if username and e-mail
are set
Acked-by: Kitware Robot
Merge-request: !4084
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5129e97285339ad0a481ffdd148bb9e09848a2f4
commit 5129e97285339ad0a481ffdd148bb9e09848a2f4
Author: Arkadiusz Drabczyk
AuthorDate: Sun Nov 24 19:10:56 2019 +0100
Commit: Arkadiusz Drabczyk
CommitDate: Sun Nov 24 19:10:56 2019 +0100
setup-user: switch to git-var to check if username and e-mail are set
In git, apart from setting username and e-mail in .gitconfig it's also
possible to set username in /etc/passwd and set e-mail using EMAIL
environment variable. The advantage of this method is that other
programs such as mutt or doxygen will pick up these settings up so
there is no need to set them separately in each program. Current way
of checking if username and e-mail are set using git config results in
failure if they are set using this method.
diff --git a/Utilities/GitSetup/setup-user b/Utilities/GitSetup/setup-user
index 1af439c45e..0b98879491 100755
--- a/Utilities/GitSetup/setup-user
+++ b/Utilities/GitSetup/setup-user
@@ -20,12 +20,12 @@
# Project configuration instructions: NONE
for (( ; ; )); do
- user_name=$(git config user.name || echo '') &&
- user_email=$(git config user.email || echo '') &&
- if test -n "$user_name" -a -n "$user_email"; then
+ ident="$(git var GIT_AUTHOR_IDENT 2>/dev/null | rev | cut -d' ' -f3- |
rev)"
+
+ if test -n "$ident"; then
echo 'Your commits will record as Author:
- '"$user_name <$user_email>"'
+ '"$ident"'
' &&
read -ep 'Is the author name and email address above correct?
[Y/n] ' correct &&
if test "$correct" != "n" -a "$correct" != "N"; then
---
Summary of changes:
Utilities/GitSetup/setup-user | 8
1 file changed, 4 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-rc4-412-g58da842063
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 58da842063cc80e34ce3ae16aa8c5fb16cdc29dd (commit)
via db3d3ab4fbc24d2e2140e861e101c5f6a5b7303b (commit)
via 99f0881d8c6d0c435e595c5f9510da776827ee3e (commit)
via a5bb08a8c0eee06b7ec0b058266d8436f868f119 (commit)
from ae2c2f1f1b5c81ea90579b605a61e9ae96b3178b (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=58da842063cc80e34ce3ae16aa8c5fb16cdc29dd
commit 58da842063cc80e34ce3ae16aa8c5fb16cdc29dd
Merge: db3d3ab4fb 99f0881d8c
Author: Brad King
AuthorDate: Mon Nov 25 14:37:57 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 25 09:38:08 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db3d3ab4fbc24d2e2140e861e101c5f6a5b7303b
commit db3d3ab4fbc24d2e2140e861e101c5f6a5b7303b
Merge: ae2c2f1f1b a5bb08a8c0
Author: Brad King
AuthorDate: Mon Nov 25 14:37:57 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 25 09:38:07 2019 -0500
Merge topic 'FindwxWidgets-rel-and-dbg'
a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs
Acked-by: Kitware Robot
Merge-request: !4079
---
Summary of changes:
Modules/FindwxWidgets.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-rc4-6-g99f0881d8c
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 99f0881d8c6d0c435e595c5f9510da776827ee3e (commit) via a5bb08a8c0eee06b7ec0b058266d8436f868f119 (commit) from 602f2118b083f998cd7523efcdd5f39689eb15ac (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/FindwxWidgets.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-rc4-408-gae2c2f1f1b
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 ae2c2f1f1b5c81ea90579b605a61e9ae96b3178b (commit) from adc50529ac163889c0353756706a7ffddb4ed957 (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=ae2c2f1f1b5c81ea90579b605a61e9ae96b3178b commit ae2c2f1f1b5c81ea90579b605a61e9ae96b3178b Author: Kitware Robot AuthorDate: Mon Nov 25 00:01:06 2019 -0500 Commit: Kitware Robot CommitDate: Mon Nov 25 00:01:06 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3aff07eb35..d8e44f686d 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 20191124) +set(CMake_VERSION_PATCH 20191125) #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-rc4-407-gadc50529ac
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 adc50529ac163889c0353756706a7ffddb4ed957 (commit) from d8571ccb9c4c7e6eca33779c083bd501b1782030 (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=adc50529ac163889c0353756706a7ffddb4ed957 commit adc50529ac163889c0353756706a7ffddb4ed957 Author: Kitware Robot AuthorDate: Sun Nov 24 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Sun Nov 24 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 39cb3369e4..3aff07eb35 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 20191123) +set(CMake_VERSION_PATCH 20191124) #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-rc4-406-gd8571ccb9c
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 d8571ccb9c4c7e6eca33779c083bd501b1782030 (commit) from 07226324ebd179a22cf581f31be07b71ab160ce6 (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=d8571ccb9c4c7e6eca33779c083bd501b1782030 commit d8571ccb9c4c7e6eca33779c083bd501b1782030 Author: Kitware Robot AuthorDate: Sat Nov 23 00:01:10 2019 -0500 Commit: Kitware Robot CommitDate: Sat Nov 23 00:01:10 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3f65c674a4..39cb3369e4 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 20191122) +set(CMake_VERSION_PATCH 20191123) #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-rc4-405-g07226324eb
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 07226324ebd179a22cf581f31be07b71ab160ce6 (commit) from 52accc779efe350cb9778005a1fb4aeb9b090456 (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=07226324ebd179a22cf581f31be07b71ab160ce6 commit 07226324ebd179a22cf581f31be07b71ab160ce6 Author: Kitware Robot AuthorDate: Fri Nov 22 00:01:10 2019 -0500 Commit: Kitware Robot CommitDate: Fri Nov 22 00:01:10 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 76ef7d3988..3f65c674a4 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 20191121) +set(CMake_VERSION_PATCH 20191122) #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-rc4-404-g52accc779e
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 52accc779efe350cb9778005a1fb4aeb9b090456 (commit)
via 51d83d4955bd22c018ff99299a224ba94452 (commit)
via 602f2118b083f998cd7523efcdd5f39689eb15ac (commit)
via 1e68fb0c91dd3f4fa64053601e878b1ffde1b439 (commit)
from ad815939c9b3f604c68a636c88f4842e1ab22129 (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=52accc779efe350cb9778005a1fb4aeb9b090456
commit 52accc779efe350cb9778005a1fb4aeb9b090456
Merge: 51d83d4955 602f2118b0
Author: Brad King
AuthorDate: Thu Nov 21 16:27:18 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:27:26 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51d83d4955bd22c018ff99299a224ba94452
commit 51d83d4955bd22c018ff99299a224ba94452
Merge: ad815939c9 1e68fb0c91
Author: Brad King
AuthorDate: Thu Nov 21 16:27:18 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:27:25 2019 -0500
Merge topic 'xcode-objc'
1e68fb0c91 Xcode: Set source file type for Objective C/C++
Acked-by: Kitware Robot
Merge-request: !4073
---
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 4
1 file changed, 4 insertions(+)
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-rc4-4-g602f2118b0
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 602f2118b083f998cd7523efcdd5f39689eb15ac (commit) via 1e68fb0c91dd3f4fa64053601e878b1ffde1b439 (commit) from 2a2c890023c7cfc643d8390a07bffe7676556b32 (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/cmGlobalXCodeGenerator.cxx | 4 1 file changed, 4 insertions(+) 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-rc4-400-gad815939c9
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 ad815939c9b3f604c68a636c88f4842e1ab22129 (commit)
via 0b14c3fded9c5e7c67c261949dc37d79d8236830 (commit)
via 96820562c6ae7041b447d8d60a3bf5ea6b7a6ecc (commit)
via d2f859f1510c334403b948481f78e56731a29eac (commit)
via ae7d99fbd51e31e012f1434ebe7ba16ea1bef060 (commit)
via 8d47b97a695111d2718c9f7a7729516e3a18e15e (commit)
via 1b27ac78ac80a0edeaa90038a15b6ac985a29880 (commit)
via c7a4b1a58efd3b7ef8794547dcee738e8fd1b483 (commit)
via e221039e11fb4961b8cbbdbd2fd8f1af99534893 (commit)
via 46de38dae2c43c0dc2dd24307a0615a11a881e39 (commit)
via 5e9ecaae0e191aba8b02243cb94a68983d6ce3f0 (commit)
via b4ef7fbaa8257254abba0d7847941baf78fdb6ed (commit)
from d9cf0ec4d4a942aec3360d66855379f7360ab00d (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=ad815939c9b3f604c68a636c88f4842e1ab22129
commit ad815939c9b3f604c68a636c88f4842e1ab22129
Merge: 0b14c3fded b4ef7fbaa8
Author: Brad King
AuthorDate: Thu Nov 21 16:10:23 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:10:34 2019 -0500
Merge topic 'ccmake_fix_help_text_crash'
b4ef7fbaa8 ccmake: Fix crash with cache entries almost the size of the
window
Acked-by: Kitware Robot
Merge-request: !4062
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b14c3fded9c5e7c67c261949dc37d79d8236830
commit 0b14c3fded9c5e7c67c261949dc37d79d8236830
Merge: 96820562c6 e221039e11
Author: Brad King
AuthorDate: Thu Nov 21 16:05:26 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:05:52 2019 -0500
Merge topic 'FindMPI-improve-error'
e221039e11 FindMPI: Improve error when a component's language is not enabled
Acked-by: Kitware Robot
Acked-by: Ben Boeckel
Merge-request: !4071
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96820562c6ae7041b447d8d60a3bf5ea6b7a6ecc
commit 96820562c6ae7041b447d8d60a3bf5ea6b7a6ecc
Merge: d2f859f151 8d47b97a69
Author: Brad King
AuthorDate: Thu Nov 21 16:04:48 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:05:03 2019 -0500
Merge topic 'UseJava-javadoc-classpath-separator'
8d47b97a69 UseJava: Use correct path separator in javadoc
1b27ac78ac UseJava: Use list(APPEND) to simplify javadoc option construction
c7a4b1a58e UseJava: Extract the path separator to module level
Acked-by: Kitware Robot
Merge-request: !3967
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2f859f1510c334403b948481f78e56731a29eac
commit d2f859f1510c334403b948481f78e56731a29eac
Merge: ae7d99fbd5 46de38dae2
Author: Brad King
AuthorDate: Thu Nov 21 16:03:46 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:04:03 2019 -0500
Merge topic 'ExternalProject-list-sep-in-cache'
46de38dae2 ExternalProject: replace LIST_SEPARATOR in initial cache files
too
Acked-by: Kitware Robot
Merge-request: !4070
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae7d99fbd51e31e012f1434ebe7ba16ea1bef060
commit ae7d99fbd51e31e012f1434ebe7ba16ea1bef060
Merge: d9cf0ec4d4 5e9ecaae0e
Author: Brad King
AuthorDate: Thu Nov 21 16:02:58 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:03:09 2019 -0500
Merge topic 'load_cache_in_script'
5e9ecaae0e load_cache: Allow READ_WITH_PREFIX mode in cmake scripts
Acked-by: Kitware Robot
Merge-request: !4042
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d47b97a695111d2718c9f7a7729516e3a18e15e
commit 8d47b97a695111d2718c9f7a7729516e3a18e15e
Author: Nathan Burles
AuthorDate: Mon Nov 4 10:40:42 2019 +
Commit: Brad King
CommitDate: Wed Nov 20 10:38:44 2019 -0500
UseJava: Use correct path separator in javadoc
For both classpath and sourcepath.
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 27f1218bbf..28f74ea6ed 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -1190,29 +1190,13 @@ function(create_javadoc _target)
set(_javadoc_options -d ${_javadoc_builddir})
if (_javadoc_sourcepath)
-set(_start TRUE)
-foreach(_path IN LISTS _javadoc_sourcepath)
-if (_start)
-set(_sourcepath ${_path})
-set(_start FALSE)
-else ()
-set(_sourcepath ${_sourcepath}:${_path})
-endif ()
-endforeach()
-list(APPEND _javadoc_options -sourcepath ${_sourcep
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc4-388-gd9cf0ec4d4
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 d9cf0ec4d4a942aec3360d66855379f7360ab00d (commit)
via 95387dbf6070bf1da9e69ee92b7104130ef290df (commit)
via 905b7759adaaa6deca51186faa19beec2790e24e (commit)
via 2a2c890023c7cfc643d8390a07bffe7676556b32 (commit)
via 84408ff4025b59f268e07bc368e97fe07252be2c (commit)
via 51c69fe5f88ea8ed262665b953f1202668ba9cf8 (commit)
from 0fff8d653c38e20d9b7a4c026b66f45f8078cb41 (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=d9cf0ec4d4a942aec3360d66855379f7360ab00d
commit d9cf0ec4d4a942aec3360d66855379f7360ab00d
Merge: 95387dbf60 51c69fe5f8
Author: Brad King
AuthorDate: Thu Nov 21 16:01:52 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:02:00 2019 -0500
Merge topic 'fileapi-multi-config'
51c69fe5f8 FileAPI: Add "multiConfig" parameter to index file
Acked-by: Kitware Robot
Acked-by: Brad King
Merge-request: !4072
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95387dbf6070bf1da9e69ee92b7104130ef290df
commit 95387dbf6070bf1da9e69ee92b7104130ef290df
Merge: 905b7759ad 2a2c890023
Author: Brad King
AuthorDate: Thu Nov 21 16:00:25 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:00:34 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=905b7759adaaa6deca51186faa19beec2790e24e
commit 905b7759adaaa6deca51186faa19beec2790e24e
Merge: 0fff8d653c 84408ff402
Author: Brad King
AuthorDate: Thu Nov 21 16:00:25 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:00:33 2019 -0500
Merge topic 'FindwxWidgets-qt-debug'
84408ff402 FindwxWidgets: Find wxQt debug libraries
Acked-by: Kitware Robot
Merge-request: !4069
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51c69fe5f88ea8ed262665b953f1202668ba9cf8
commit 51c69fe5f88ea8ed262665b953f1202668ba9cf8
Author: Kyle Edwards
AuthorDate: Wed Nov 20 09:44:28 2019 -0500
Commit: Kyle Edwards
CommitDate: Wed Nov 20 09:46:10 2019 -0500
FileAPI: Add "multiConfig" parameter to index file
diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst
index 04b6ed2598..12eecd9932 100644
--- a/Help/manual/cmake-file-api.7.rst
+++ b/Help/manual/cmake-file-api.7.rst
@@ -199,6 +199,7 @@ The reply index file contains a JSON object:
"root": "/prefix/share/cmake-3.14"
},
"generator": {
+"multiConfig": false,
"name": "Unix Makefiles"
}
},
@@ -267,6 +268,9 @@ The members are:
A JSON object describing the CMake generator used for the build.
It has members:
+``multiConfig``
+ A boolean specifying whether the generator supports multiple output
+ configurations.
``name``
A string specifying the name of the generator.
``platform``
diff --git a/Help/release/dev/fileapi-multi-config.rst
b/Help/release/dev/fileapi-multi-config.rst
new file mode 100644
index 00..e0e2e16a52
--- /dev/null
+++ b/Help/release/dev/fileapi-multi-config.rst
@@ -0,0 +1,6 @@
+fileapi-multi-config
+
+
+* The :manual:`file API ` index file now emits a
+ ``multiConfig`` flag specifying whether or not the generator supports
+ multiple output configurations.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d903289e4b..e38066fc8d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -124,6 +124,7 @@ Json::Value cmGlobalGenerator::GetJson() const
{
Json::Value generator = Json::objectValue;
generator["name"] = this->GetName();
+ generator["multiConfig"] = this->IsMultiConfig();
return generator;
}
#endif
diff --git a/Tests/RunCMake/FileAPI/check_index.py
b/Tests/RunCMake/FileAPI/check_index.py
index cda72341cb..23b02e908a 100644
--- a/Tests/RunCMake/FileAPI/check_index.py
+++ b/Tests/RunCMake/FileAPI/check_index.py
@@ -109,10 +109,11 @@ def check_cmake_generator(g):
name = g.get("name", None)
assert is_string(name)
if name.startswith("Visual Studio"):
-assert sorted(g.keys()) == ["name", "platform"]
+assert sorted(g.keys()) == ["multiConfig", "name", "platform"]
assert is_string(g["platform"])
else:
-assert sorted(g.keys()) == ["name"]
+
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc4-2-g2a2c890023
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 2a2c890023c7cfc643d8390a07bffe7676556b32 (commit) via 84408ff4025b59f268e07bc368e97fe07252be2c (commit) from d25d75687d3fe53ab19b61b5d671c83d8203f15c (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/FindwxWidgets.cmake | 2 ++ 1 file changed, 2 insertions(+) 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-rc4-382-g0fff8d653c
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 0fff8d653c38e20d9b7a4c026b66f45f8078cb41 (commit) from 5f630a934aa4b8616aa59988ea70c14065d3a08d (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=0fff8d653c38e20d9b7a4c026b66f45f8078cb41 commit 0fff8d653c38e20d9b7a4c026b66f45f8078cb41 Author: Kitware Robot AuthorDate: Thu Nov 21 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Thu Nov 21 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 102b3defc1..76ef7d3988 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 20191120) +set(CMake_VERSION_PATCH 20191121) #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-rc4-381-g5f630a934a
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 5f630a934aa4b8616aa59988ea70c14065d3a08d (commit) from 9e9787f19a69ed6e0482d29a508548b048dd025d (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=5f630a934aa4b8616aa59988ea70c14065d3a08d commit 5f630a934aa4b8616aa59988ea70c14065d3a08d Author: Kitware Robot AuthorDate: Wed Nov 20 00:01:10 2019 -0500 Commit: Kitware Robot CommitDate: Wed Nov 20 00:01:10 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8a606d4b6f..102b3defc1 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 20191119) +set(CMake_VERSION_PATCH 20191120) #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-rc4-380-g9e9787f19a
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 9e9787f19a69ed6e0482d29a508548b048dd025d (commit)
via 32c165d2636a65362265d20a16e1f914a53882dd (commit)
from 3520208cbd0ebf9f3db1a9711b49286462cd7e54 (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=9e9787f19a69ed6e0482d29a508548b048dd025d
commit 9e9787f19a69ed6e0482d29a508548b048dd025d
Merge: 3520208cbd 32c165d263
Author: Craig Scott
AuthorDate: Tue Nov 19 20:48:25 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 19 15:48:38 2019 -0500
Merge topic 'ctest-repeat'
32c165d263 CTest: Consolidate '--repeat-* n' options as `--repeat *:n`
Acked-by: Kitware Robot
Merge-request: !4053
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32c165d2636a65362265d20a16e1f914a53882dd
commit 32c165d2636a65362265d20a16e1f914a53882dd
Author: Brad King
AuthorDate: Fri Nov 15 09:28:37 2019 -0500
Commit: Brad King
CommitDate: Fri Nov 15 10:08:33 2019 -0500
CTest: Consolidate '--repeat-* n' options as `--repeat *:n`
Combine `--repeat-until-fail`, `--repeat-until-pass`, and
`--repeat-after-timeout` to create a single `--repeat :`
option. Retain `--repeat-until-fail` too because that has been
available in previous releases.
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index 328f5794c4..2a6cb48b2c 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -261,23 +261,27 @@ Options
fail, subsequent calls to CTest with the ``--rerun-failed`` option will run
the set of tests that most recently failed (if any).
-``--repeat-until-fail ``
- Require each test to run times without failing in order to pass.
-
- This is useful in finding sporadic failures in test cases.
+``--repeat :``
+ Run tests repeatedly based on the given up to times.
+ The modes are:
-``--repeat-until-pass ``
- Allow each test to run up to times in order to pass.
- Repeats tests if they fail for any reason.
+ ``until-fail``
+Require each test to run times without failing in order to pass.
+This is useful in finding sporadic failures in test cases.
- This is useful in tolerating sporadic failures in test cases.
+ ``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.
+ ``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.
- This is useful in tolerating sporadic timeouts in test cases
- on busy machines.
+``--repeat-until-fail ``
+ Equivalent to ``--repeat until-fail:``.
``--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
deleted file mode 100644
index b5f6c26281..00
--- a/Help/release/dev/ctest-repeat-until-pass.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-ctest-repeat-until-pass
-
-* The :manual:`ctest(1)` tool learned new ``--repeat-until-pass ``
- and ``--repeat-after-timeout `` options to help tolerate sporadic
- test failures.
-
-* The :command:`ctest_test` command gained a ``REPEAT :`` option
- to specify conditions in which to repeat tests.
diff --git a/Help/release/dev/ctest-repeat.rst
b/Help/release/dev/ctest-repeat.rst
new file mode 100644
index 00..b1ff59bfdc
--- /dev/null
+++ b/Help/release/dev/ctest-repeat.rst
@@ -0,0 +1,10 @@
+ctest-repeat
+
+
+* The :manual:`ctest(1)` tool gained a ``--repeat :`` option
+ to specify conditions in which to repeat tests. This generalizes
+ the existing ``--repeat-until-fail `` option to add modes for
+ ``until-pass`` and ``after-timeout``.
+
+* The :command:`ctest_test` command gained a ``REPEAT :`` option
+ to specify conditions in which to repeat tests.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index a49866ce98..76a2bba85c 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -21,6 +21,7 @@
#include "cmsys/FStream.hxx"
#include "cmsys/Glob.hxx"
#include "cmsys/Process.h"
+#include "cmsys/RegularExpression.hxx"
#include "cmsys/SystemInformation.hxx"
#include "cm_curl.h"
@@ -1846,7 +1847,7 @@
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc4-378-g3520208cbd
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 3520208cbd0ebf9f3db1a9711b49286462cd7e54 (commit)
via ce99f5ee69a6f8ebbf26d2a82df89b406becaf77 (commit)
from a1d0653fc8d8cc07aa130920b86e605e17beaa79 (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=3520208cbd0ebf9f3db1a9711b49286462cd7e54
commit 3520208cbd0ebf9f3db1a9711b49286462cd7e54
Merge: a1d0653fc8 ce99f5ee69
Author: Brad King
AuthorDate: Tue Nov 19 16:37:16 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 19 11:37:27 2019 -0500
Merge topic 'ccmake_render_main_form_on_resize'
ce99f5ee69 ccmake: Fix rendering on window resize
Acked-by: Kitware Robot
Merge-request: !4061
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce99f5ee69a6f8ebbf26d2a82df89b406becaf77
commit ce99f5ee69a6f8ebbf26d2a82df89b406becaf77
Author: Sylvain Joubert
AuthorDate: Mon Nov 18 13:21:08 2019 +0100
Commit: Sylvain Joubert
CommitDate: Mon Nov 18 17:05:37 2019 +0100
ccmake: Fix rendering on window resize
Repro steps: configure (without errors), the logs are displayed then the
cache is displayed again, resize the window up -> the logs are
redisplayed after resize instead of the cache
The 'CurrentForm' pointer were left pointed to the last log message
form, this resets it to the main form when configure or generate is done
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx
b/Source/CursesDialog/cmCursesMainForm.cxx
index dff2afed61..612b432b3f 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -498,10 +498,6 @@ void cmCursesMainForm::UpdateProgress(const std::string&
msg, float prog)
int cmCursesMainForm::Configure(int noconfigure)
{
- int xi;
- int yi;
- getmaxyx(stdscr, yi, xi);
-
this->ResetOutputs();
if (noconfigure == 0) {
@@ -559,11 +555,13 @@ int cmCursesMainForm::Configure(int noconfigure)
if (retVal == -2) {
return retVal;
}
-CurrentForm = this;
-this->Render(1, 1, xx, yy);
}
this->InitializeUI();
+ CurrentForm = this;
+ int xi;
+ int yi;
+ getmaxyx(stdscr, yi, xi);
this->Render(1, 1, xi, yi);
return 0;
@@ -571,10 +569,6 @@ int cmCursesMainForm::Configure(int noconfigure)
int cmCursesMainForm::Generate()
{
- int xi;
- int yi;
- getmaxyx(stdscr, yi, xi);
-
this->ResetOutputs();
this->UpdateProgress("Generating", 0);
@@ -614,11 +608,13 @@ int cmCursesMainForm::Generate()
if (retVal == -2) {
return retVal;
}
-CurrentForm = this;
-this->Render(1, 1, xx, yy);
}
this->InitializeUI();
+ CurrentForm = this;
+ int xi;
+ int yi;
+ getmaxyx(stdscr, yi, xi);
this->Render(1, 1, xi, yi);
return 0;
---
Summary of changes:
Source/CursesDialog/cmCursesMainForm.cxx | 20
1 file changed, 8 insertions(+), 12 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-rc4-376-ga1d0653fc8
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 a1d0653fc8d8cc07aa130920b86e605e17beaa79 (commit)
via aa6437e3e0132b959cc28cb7a8115f82b92c754e (commit)
via ba773cfec84540799a8a741ec388218013699769 (commit)
via 5aa94a1d0d4b4645ce6a73bd2d0c560dee86b466 (commit)
via fb7f8e5fbdfce6e7d98781544d8cd28fe8911a8b (commit)
via 92c4c852db821bc75ef0a20db4855e3af57ef80d (commit)
via 7d6639bf8d9298d9f4c81fa035cda5d34a6e1622 (commit)
via 5cf404d36f24ed8caebceb7083cef7fb44f179f3 (commit)
via 7e86f71eff72a12e903cdd2efccf55ec3d58a106 (commit)
via c5fb36a4cb8bd3272e2e0b54e3947886ad7eb778 (commit)
from 843936f51b4f409d3106857a3954ff2db669becd (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=a1d0653fc8d8cc07aa130920b86e605e17beaa79
commit a1d0653fc8d8cc07aa130920b86e605e17beaa79
Merge: aa6437e3e0 92c4c852db
Author: Brad King
AuthorDate: Tue Nov 19 16:30:06 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 19 11:31:16 2019 -0500
Merge topic 'xcode-scheme-workdir'
92c4c852db Xcode: Add custom working directory property
Acked-by: Kitware Robot
Merge-request: !4063
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa6437e3e0132b959cc28cb7a8115f82b92c754e
commit aa6437e3e0132b959cc28cb7a8115f82b92c754e
Merge: ba773cfec8 7d6639bf8d
Author: Brad King
AuthorDate: Tue Nov 19 16:28:40 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 19 11:30:20 2019 -0500
Merge topic 'codelite_make_j_0'
7d6639bf8d CodeLite: Do not pass -j argument with CPU count 0
Acked-by: Kitware Robot
Merge-request: !4067
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba773cfec84540799a8a741ec388218013699769
commit ba773cfec84540799a8a741ec388218013699769
Merge: 5aa94a1d0d 7e86f71eff
Author: Brad King
AuthorDate: Tue Nov 19 16:28:14 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 19 11:29:26 2019 -0500
Merge topic 'modernize-memory-management'
7e86f71eff cmOutputRequiredFilesCommand: Modernize memory management
Acked-by: Kitware Robot
Merge-request: !4055
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5aa94a1d0d4b4645ce6a73bd2d0c560dee86b466
commit 5aa94a1d0d4b4645ce6a73bd2d0c560dee86b466
Merge: fb7f8e5fbd 5cf404d36f
Author: Brad King
AuthorDate: Tue Nov 19 16:27:26 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 19 11:28:13 2019 -0500
Merge topic 'sdcc-sdar'
5cf404d36f SDCC compiler: use sdar instead of sdcclib as librarian for
recent versions
Acked-by: Kitware Robot
Merge-request: !4065
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb7f8e5fbdfce6e7d98781544d8cd28fe8911a8b
commit fb7f8e5fbdfce6e7d98781544d8cd28fe8911a8b
Merge: 843936f51b c5fb36a4cb
Author: Brad King
AuthorDate: Tue Nov 19 16:27:07 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 19 11:27:15 2019 -0500
Merge topic 'FindFLEX-work-dir'
c5fb36a4cb FindFLEX: Add policy CMP0098 to run flex in build tree
Acked-by: Kitware Robot
Merge-request: !3981
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92c4c852db821bc75ef0a20db4855e3af57ef80d
commit 92c4c852db821bc75ef0a20db4855e3af57ef80d
Author: Gregor Jasny
AuthorDate: Mon Nov 18 22:01:04 2019 +0100
Commit: Gregor Jasny
CommitDate: Mon Nov 18 22:34:34 2019 +0100
Xcode: Add custom working directory property
Closes: #19967
diff --git a/Help/manual/cmake-properties.7.rst
b/Help/manual/cmake-properties.7.rst
index 94d08c6b5f..c5ef09abef 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -381,6 +381,7 @@ Properties on Targets
/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER
/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN
/prop_tgt/XCODE_SCHEME_ARGUMENTS
+ /prop_tgt/XCODE_SCHEME_WORKING_DIRECTORY
/prop_tgt/XCODE_SCHEME_DEBUG_AS_ROOT
/prop_tgt/XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING
/prop_tgt/XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index 01dd5fdc4c..0c1d510995 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -239,6 +239,7 @@ Variables that Change Behavior
/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY
/variable/CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER
/variable/CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN
+
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc4-366-g843936f51b
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 843936f51b4f409d3106857a3954ff2db669becd (commit) from 6eaa355e90dc5b08e76123dc96386442c18d2528 (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=843936f51b4f409d3106857a3954ff2db669becd commit 843936f51b4f409d3106857a3954ff2db669becd Author: Kitware Robot AuthorDate: Tue Nov 19 00:01:12 2019 -0500 Commit: Kitware Robot CommitDate: Tue Nov 19 00:01:12 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 743996f91d..8a606d4b6f 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 20191118) +set(CMake_VERSION_PATCH 20191119) #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-rc4, created. v3.16.0-rc4
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-rc4 has been created at 16e5bdfa421adeb28298484be3d8a2e675eb971c (tag) tagging d25d75687d3fe53ab19b61b5d671c83d8203f15c (commit) replaces v3.16.0-rc3 tagged by Brad King on Mon Nov 18 16:42:15 2019 -0500 - Log - CMake 3.16.0-rc4 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl3TEDcWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhES4D/98iUU7nYKu9m+mXAl49Ja2R8+X am6FkwyIinv3L1IUPx+/6ykUfxaajJp/aeG4k2vuVqUknjBUYlYcE6oNtKEch++0 x1jd3XPK8gWNK/yRnHRQXR7t0MigcvckeAkw9TaxLv9BGGlfpdEtWctokW6mpDQ/ 5IcNT94ZRmBjY7AmOTKLPALc3FV//trsETpxp1Hn69gz/cL4nje++hemhY/+1Us6 SFRjrF9GelZ9IQp9My+tkM5et7yLTp+CgmCdzV5Ql1GgsMNBHpNnbX1sLlasF6El +4cS35YBlwxW1OX91FT7EIARNhFoH10da+duaBil1Ql6ou0Tv4ZmP7IDP+6tgyMS amThAATle1nmfy0+yCbSC1EtSBH5coKMTwfa7P0i4Xg8OLdiALQNB5/6XGuchk1D lz246E9LEozLh4QMJTwLaFDmay8LBTiHrzjUUAWJ2cuuXuPwrtUATYKllwrRIWAr gRX1UmYJW7JRtjlTOuG/XHq+BmFFhPQ8Sqn+GEFmB1ksFQySqAlS+nhO5jUp5xzl qX7T3oPbTM93/HlKr2+UTeFLehfrYMWYDbfF5mxC4gMBjlGyBoxOZpOr0OMCL9T4 1RWSG52lBP176ZNNQOk/Js0AkGT6jdkXPV6IBB2iTCjU/+5XWWyCZJJDgdHU4mcF AiGyvlgL+HRExwA25g== =d7BX -END PGP SIGNATURE- Alex Turbov (1): CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS Arkadiusz Drabczyk (1): Tutorial: replace Unicode EN DASH with ASCII dash Ben Boeckel (3): Help: drop confusing reference to `if()` from `$` FindPostgreSQL: support version encoding used in pre-10 releases FindPostgreSQL: also search for libraries in the MacPorts suffix Brad King (63): Merge branch 'clarify-BOOL-genex-eval' into release-3.16 Merge branch 'fix_load_cache_docs' into release-3.16 Merge branch 'update-compile-feature-supported-compiler-list' into release-3.16 Merge branch 'FindwxWidgets-wxwin-313' into release-3.16 Merge branch 'root-dir-assertion-fix' into release-3.16 Merge branch 'tutorial-cleanup' into release-3.16 Merge branch 'docs-INSTALL_REMOVE_ENVIRONMENT_PATH' into release-3.16 Merge branch 'clarify_compile_features_documentation' into release-3.16 Merge branch 'objc-pch' into release-3.16 Merge branch 'source_group-tree' into release-3.16 Merge branch 'findpostgres-10-and-older' into release-3.16 CTest: Rename PROCESSES test property to RESOURCE_GROUPS CTest: Rename "Processes" lexer to "ResourceGroups" Help/dev: Update maintainer guide for Discourse transition cmGlobalXCodeGenerator: Mark known source locations Xcode: Fix generated references to CMakeLists.txt files CMakeCPack: Update Debian package contact email Help: Replace links to mailing lists with links to our Discourse Forum README: Update links to cmake.org pages README: Replace link to mailing list the CMake Discourse Forum CMakeSystemSpecificInformation: Replace mailing list with Discourse Forum Merge topic 'xcode-restore-CMakeLists' into release-3.16 Merge topic 'FindBoost-meta-component-ALL' into release-3.16 Merge topic 'objc-x-objc' into release-3.16 Merge topic 'llvm-rc-fix' into release-3.16 Merge topic 'unity-include-generated' into release-3.16 FindBinUtils: Revert "Use the compiler to get the path to compiler tools" Merge topic 'revert-FindBinUtils-ask-compiler' into release-3.16 Help: Document target_precompile_headers genex with angle brackets Merge topic 'doc-pch-genex' into release-3.16 CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs Merge topic 'CTestCoverageCollectGCOV-typo' into release-3.16 Merge topic 'objc-link-main' into release-3.16 Merge topic 'objc-trycompile' into release-3.16 expat: Update script to get Expat 2.2.9 Merge branch 'upstream-expat' into update-expat expat: Update CMake build for 2.2.9 Tests: Fix ExportImport PCH expectation on Cray Classic compiler Tests: Add RunCMake.CPackCommandLine case for multi-config package Merge topic 'resolve-full-path-at-generate-time' into release-3.16 Merge topic 'pch-cray-classic' into release-3.16 Merge topic 'reference-IMPORTED_IMPLIB-more' into release-3.16 Merge topic 'update-expat' into release-3.16 Merge topic 'objc-xcode-flags' into release-3.16 Merge topic 'objc-standard-docs' into release-3.16 Merge topic 'unity-HEADER_FILE_ONLY' into release-3.16 Merge topic 'swift-rpath-separator' into release-3.16 Merge topic 'FindwxWidgets-qt' into release-3.16 Merge topic 'objc-standard' into release-3.16 Merge topic 'FindwxWidgets-mingw' into release-3.16 Tests: Organize Objective C/C++ test directories Merge topic 'FindPostgreSQL-macports-libsuffix' into release-3.16
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-490-g6eaa355e90
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 6eaa355e90dc5b08e76123dc96386442c18d2528 (commit) via d25d75687d3fe53ab19b61b5d671c83d8203f15c (commit) from 9112933a6cb398daade678c1bada5e363dcab09c (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=6eaa355e90dc5b08e76123dc96386442c18d2528 commit 6eaa355e90dc5b08e76123dc96386442c18d2528 Merge: 9112933a6c d25d75687d Author: Brad King AuthorDate: Mon Nov 18 17:02:37 2019 -0500 Commit: Brad King CommitDate: Mon Nov 18 17:02:37 2019 -0500 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-125-gd25d75687d
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 d25d75687d3fe53ab19b61b5d671c83d8203f15c (commit) from 3a87ce6c962d2b5b0661d7b611070adf7077b27b (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-rc3-488-g9112933a6c
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 9112933a6cb398daade678c1bada5e363dcab09c (commit)
via 9c9bbedd31bccd77beac6851b81831469b176d4d (commit)
via 3a87ce6c962d2b5b0661d7b611070adf7077b27b (commit)
via ff6c336127973d09ac7d20f846854bdebf384201 (commit)
from 3bc808fc3315d459a7d029645a9e892b7abcaa9a (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=9112933a6cb398daade678c1bada5e363dcab09c
commit 9112933a6cb398daade678c1bada5e363dcab09c
Merge: 9c9bbedd31 3a87ce6c96
Author: Brad King
AuthorDate: Mon Nov 18 18:42:02 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 13:43:12 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c9bbedd31bccd77beac6851b81831469b176d4d
commit 9c9bbedd31bccd77beac6851b81831469b176d4d
Merge: 3bc808fc33 ff6c336127
Author: Brad King
AuthorDate: Mon Nov 18 18:42:02 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 13:43:11 2019 -0500
Merge topic 'swift-rpath-darwin'
ff6c336127 Swift: support `-rpath` on Darwin
Acked-by: Kitware Robot
Merge-request: !4059
---
Summary of changes:
Modules/CMakeSwiftInformation.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-124-g3a87ce6c96
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 3a87ce6c962d2b5b0661d7b611070adf7077b27b (commit) via ff6c336127973d09ac7d20f846854bdebf384201 (commit) from 4bbd9e9ec4cf234df82f7d25449f3f3a8406979a (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/CMakeSwiftInformation.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-484-g3bc808fc33
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 3bc808fc3315d459a7d029645a9e892b7abcaa9a (commit)
via eead6a25049d1186a99914fed41d5b692045f051 (commit)
via 4bbd9e9ec4cf234df82f7d25449f3f3a8406979a (commit)
via f935de6746f676dd435c09ca161a46aa289faf3b (commit)
from cbedead9a25c12272918f1f70c8a1e1417605728 (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=3bc808fc3315d459a7d029645a9e892b7abcaa9a
commit 3bc808fc3315d459a7d029645a9e892b7abcaa9a
Merge: eead6a2504 4bbd9e9ec4
Author: Brad King
AuthorDate: Mon Nov 18 18:41:58 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 13:42:09 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eead6a25049d1186a99914fed41d5b692045f051
commit eead6a25049d1186a99914fed41d5b692045f051
Merge: cbedead9a2 f935de6746
Author: Brad King
AuthorDate: Mon Nov 18 18:41:58 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 13:42:09 2019 -0500
Merge topic 'swift-darwin-install-name'
f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin
Acked-by: Kitware Robot
Merge-request: !4060
---
Summary of changes:
Modules/CMakeSwiftInformation.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-122-g4bbd9e9ec4
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 4bbd9e9ec4cf234df82f7d25449f3f3a8406979a (commit) via f935de6746f676dd435c09ca161a46aa289faf3b (commit) from e64d39eb42a13f3a8d0e3d005a2936a27a2c8257 (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/CMakeSwiftInformation.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-120-ge64d39eb42
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 e64d39eb42a13f3a8d0e3d005a2936a27a2c8257 (commit) via 229f2cc5fd1ae26988b9ce71a0d9245a1709d674 (commit) from 1c09b8c164e0efd8fe82bb783d014e09e0285a0e (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 | 7 ++- 1 file changed, 6 insertions(+), 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-480-gcbedead9a2
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 cbedead9a25c12272918f1f70c8a1e1417605728 (commit)
via 26f3cb32883f4e9c49b290557669020a729cc9f1 (commit)
via e64d39eb42a13f3a8d0e3d005a2936a27a2c8257 (commit)
via 229f2cc5fd1ae26988b9ce71a0d9245a1709d674 (commit)
from 776d1e5e79ab5194a39ea53252703bf3cc13c118 (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=cbedead9a25c12272918f1f70c8a1e1417605728
commit cbedead9a25c12272918f1f70c8a1e1417605728
Merge: 26f3cb3288 e64d39eb42
Author: Brad King
AuthorDate: Mon Nov 18 14:53:57 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 09:54:15 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26f3cb32883f4e9c49b290557669020a729cc9f1
commit 26f3cb32883f4e9c49b290557669020a729cc9f1
Merge: 776d1e5e79 229f2cc5fd
Author: Brad King
AuthorDate: Mon Nov 18 14:53:57 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 09:54:15 2019 -0500
Merge topic 'compile-features-other-lang'
229f2cc5fd Help: Clarify compile features handling for OBJC and OBJCXX
Acked-by: Kitware Robot
Merge-request: !4057
---
Summary of changes:
Help/manual/cmake-compile-features.7.rst | 7 ++-
1 file changed, 6 insertions(+), 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-118-g1c09b8c164
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 1c09b8c164e0efd8fe82bb783d014e09e0285a0e (commit) via 667a88e260c4fccd0da23a96e3768d4e01dadc23 (commit) via 6cb9867ba3054ea4fbafa7ee60485db4d6266354 (commit) via 7d6ab5dc5bac806a268eac55deaf5bc550aaa6d4 (commit) via bb4c2781ced335c81b3c9307069792dba66d5062 (commit) via cc88ede7a37f8180f670c0d6036ba40cf005c7b9 (commit) via dae9a808fe0cb039298fab75459e3803403c5194 (commit) from fc4f00cbf64c6f192b36e7b9187fc26a1f51a4b4 (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 | 122 - Help/prop_tgt/INTERFACE_PRECOMPILE_HEADERS.rst | 2 + Source/CPack/WiX/cmCPackWIXGenerator.cxx | 2 +- Source/CPack/cmCPackGenerator.cxx | 11 ++ Source/CPack/cmCPackNSISGenerator.cxx | 5 +- Source/CPack/cmCPackOSXX11Generator.cxx| 2 +- Source/CPack/cmCPackPKGGenerator.cxx | 4 +- Source/CPack/cmCPackSTGZGenerator.cxx | 3 +- Source/cmGeneratorTarget.cxx | 9 +- Source/cmTarget.cxx| 7 +- .../RunCMake/PrecompileHeaders/PchReuseFrom.cmake | 9 +- Tests/RunCMake/PrecompileHeaders/foobar.c | 8 +- 12 files changed, 115 insertions(+), 69 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-476-g776d1e5e79
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 776d1e5e79ab5194a39ea53252703bf3cc13c118 (commit)
via c80dfa0d5ba8817d73de5ee0a324d114b8336e05 (commit)
via 0e46dea3430958183cb514c2a5518b5079ef588c (commit)
via 1c09b8c164e0efd8fe82bb783d014e09e0285a0e (commit)
via bd1655571738126eaf878960423a648cb34baf0b (commit)
via e2cb9bcef22278564a15c696d3141fd2b3425a81 (commit)
via 667a88e260c4fccd0da23a96e3768d4e01dadc23 (commit)
via 498e3e67b3d4bd4e813d1fa1851c1d7aa115253d (commit)
via 6cb9867ba3054ea4fbafa7ee60485db4d6266354 (commit)
via b60563fee8cfa981f997d20df37d26938bf24883 (commit)
via e14c9af013e8fe898a2cb46f4c1bd73dc72ff0a6 (commit)
via 7d6ab5dc5bac806a268eac55deaf5bc550aaa6d4 (commit)
via bb4c2781ced335c81b3c9307069792dba66d5062 (commit)
via a4c19cb895f6275c5ff1a3991a117df1ad27cf15 (commit)
via 0b9f1cc96b5babb10f14781648b02f9a28124cbc (commit)
via 9e27e52d4b0fee729f9a3bef710efed290ef9900 (commit)
via 26367b4bb2be9013d3bc30deef8ef1eda866a5cd (commit)
via cc88ede7a37f8180f670c0d6036ba40cf005c7b9 (commit)
via dae9a808fe0cb039298fab75459e3803403c5194 (commit)
from f63d84c37c9ee1ea686369848b5bfc22916e1551 (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=776d1e5e79ab5194a39ea53252703bf3cc13c118
commit 776d1e5e79ab5194a39ea53252703bf3cc13c118
Merge: c80dfa0d5b a4c19cb895
Author: Brad King
AuthorDate: Mon Nov 18 14:51:59 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 09:52:13 2019 -0500
Merge topic 'win-no-error-popup'
a4c19cb895 Windows: Restore suppression of error report popups in CI builds
0b9f1cc96b Merge branch 'upstream-KWSys' into win-no-error-popup
9e27e52d4b KWSys 2019-11-15 (329d8c7c)
Acked-by: Kitware Robot
Merge-request: !4052
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c80dfa0d5ba8817d73de5ee0a324d114b8336e05
commit c80dfa0d5ba8817d73de5ee0a324d114b8336e05
Merge: 0e46dea343 1c09b8c164
Author: Brad King
AuthorDate: Mon Nov 18 14:50:35 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 09:50:58 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e46dea3430958183cb514c2a5518b5079ef588c
commit 0e46dea3430958183cb514c2a5518b5079ef588c
Merge: bd16555717 7d6ab5dc5b
Author: Brad King
AuthorDate: Mon Nov 18 14:50:35 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 09:50:57 2019 -0500
Merge topic 'cpack-custom-templates'
7d6ab5dc5b CPack: Restore support for custom package configuration templates
Acked-by: Kitware Robot
Acked-by: Kyle Edwards
Merge-request: !4054
diff --cc Source/CPack/cmCPackPKGGenerator.cxx
index 328aac3826,dae5ec9d4b..ac3d64d9ae
--- a/Source/CPack/cmCPackPKGGenerator.cxx
+++ b/Source/CPack/cmCPackPKGGenerator.cxx
@@@ -46,69 -46,10 +46,69 @@@ std::string cmCPackPKGGenerator::GetPac
return component.ArchiveFile + ".pkg";
}
-void cmCPackPKGGenerator::WriteDistributionFile(const char* metapackageFile)
+void cmCPackPKGGenerator::CreateBackground(const char* themeName,
+ const char* metapackageFile,
+ cm::string_view genName,
+ cmXMLWriter& xout)
+{
+ std::string paramSuffix =
+(themeName == nullptr) ? "" : cmSystemTools::UpperCase(themeName);
+ std::string opt = (themeName == nullptr)
+? cmStrCat("CPACK_", genName, "_BACKGROUND")
+: cmStrCat("CPACK_", genName, "_BACKGROUND_", paramSuffix);
+ const char* bgFileName = this->GetOption(opt);
+ if (bgFileName == nullptr) {
+return;
+ }
+
+ std::string bgFilePath = cmStrCat(metapackageFile, "/Contents/",
bgFileName);
+
+ if (!cmSystemTools::FileExists(bgFilePath)) {
+cmCPackLogger(cmCPackLog::LOG_ERROR,
+ "Background image doesn't exist in the resource directory: "
+<< bgFileName << std::endl);
+return;
+ }
+
+ if (themeName == nullptr) {
+xout.StartElement("background");
+ } else {
+xout.StartElement(cmStrCat("background-", themeName));
+ }
+
+ xout.Attribute("file", bgFileName);
+
+ const char* param = this->GetOption(cmStrCat(opt, "_ALIGNMENT"));
+ if (param != nullptr) {
+xo
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-457-gf63d84c37c
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 f63d84c37c9ee1ea686369848b5bfc22916e1551 (commit)
via 4ea992ab3241362d3b38aaa48319d13ef2cb87c5 (commit)
via fc4f00cbf64c6f192b36e7b9187fc26a1f51a4b4 (commit)
via 1bd06579a3435d82ce1146c431c582b72c18fec9 (commit)
via 02aa03eb0a5e8551fb69b63712ef4512343cd769 (commit)
via 88cfef0821933dfa4e840c793cdb9352d4b4423b (commit)
from e56e9c14c5f06341c101e8de2a4876ecf3f5514f (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=f63d84c37c9ee1ea686369848b5bfc22916e1551
commit f63d84c37c9ee1ea686369848b5bfc22916e1551
Merge: 4ea992ab32 fc4f00cbf6
Author: Craig Scott
AuthorDate: Mon Nov 18 10:49:52 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 05:50:02 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ea992ab3241362d3b38aaa48319d13ef2cb87c5
commit 4ea992ab3241362d3b38aaa48319d13ef2cb87c5
Merge: 1bd06579a3 02aa03eb0a
Author: Craig Scott
AuthorDate: Mon Nov 18 10:49:52 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 05:50:02 2019 -0500
Merge topic 'tutorial-replace-unicode-dash'
02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash
Acked-by: Kitware Robot
Merge-request: !4058
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bd06579a3435d82ce1146c431c582b72c18fec9
commit 1bd06579a3435d82ce1146c431c582b72c18fec9
Merge: e56e9c14c5 88cfef0821
Author: Craig Scott
AuthorDate: Mon Nov 18 10:46:16 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 18 05:46:31 2019 -0500
Merge topic 'ccmake_redirect_stdstreams'
88cfef0821 ccmake: redirect stdout/stderr to the displayed logs
Acked-by: Kitware Robot
Merge-request: !4005
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88cfef0821933dfa4e840c793cdb9352d4b4423b
commit 88cfef0821933dfa4e840c793cdb9352d4b4423b
Author: Sylvain Joubert
AuthorDate: Tue Nov 5 17:07:42 2019 +0100
Commit: Sylvain Joubert
CommitDate: Sat Nov 16 08:27:32 2019 +0100
ccmake: redirect stdout/stderr to the displayed logs
Use cmSystemTools to report some messages.
These should now be caught and displayed properly,
both in ccmake and cmake-gui
Avoid log display flickering during processing
- Don't clear the screen each time the long message form is rendered.
It always renders the whole screen again so clearing it only causes
flickering.
- Add scroll down capabilities to the long message form so that it can
draw itself directly in the correct state. This removes the need to
programatically scroll down just after that also caused flickering.
Fixes #19882
Fixes #13288
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index 7732105085..01fce85454 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -155,10 +155,28 @@ int main(int argc, char const* const* argv)
return 1;
}
+ /*
+ * The message is stored in a list by the form which will be
+ * joined by '\n' before display.
+ * Removing any trailing '\n' avoid extra empty lines in the final results
+ */
+ auto cleanMessage = [](const std::string& message) -> std::string {
+auto msg = message;
+if (!msg.empty() && msg.back() == '\n') {
+ msg.pop_back();
+}
+return msg;
+ };
cmSystemTools::SetMessageCallback(
-[myform](const std::string& message, const char* title) {
- myform->AddError(message, title);
+[&](const std::string& message, const char* title) {
+ myform->AddError(cleanMessage(message), title);
});
+ cmSystemTools::SetStderrCallback([&](const std::string& message) {
+myform->AddError(cleanMessage(message), "");
+ });
+ cmSystemTools::SetStdoutCallback([&](const std::string& message) {
+myform->UpdateProgress(cleanMessage(message), -1);
+ });
cmCursesForm::CurrentForm = myform;
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx
b/Source/CursesDialog/cmCursesLongMessageForm.cxx
index a69fdee894..806e663e9e 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.cxx
+++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx
@@ -17,7 +17,9 @@ inline int ctrl(int z)
}
cmCursesLongMessageForm::cmCursesLongMessageForm(
- std::vector const& messages, const char* title)
+ std::vector const& messages, const char* title,
+ Sc
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-111-gfc4f00cbf6
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 fc4f00cbf64c6f192b36e7b9187fc26a1f51a4b4 (commit) via 02aa03eb0a5e8551fb69b63712ef4512343cd769 (commit) from f8a1b07953e6bf40da7def8459f8327cb007d2a9 (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/guide/tutorial/index.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, master, updated. v3.16.0-rc3-451-ge56e9c14c5
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 e56e9c14c5f06341c101e8de2a4876ecf3f5514f (commit) from cf598311ce9c6edb2b7d2a1de945ba7f2418c2fb (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=e56e9c14c5f06341c101e8de2a4876ecf3f5514f commit e56e9c14c5f06341c101e8de2a4876ecf3f5514f Author: Kitware Robot AuthorDate: Mon Nov 18 00:01:09 2019 -0500 Commit: Kitware Robot CommitDate: Mon Nov 18 00:01:09 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index be89acf77a..743996f91d 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 20191117) +set(CMake_VERSION_PATCH 20191118) #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-450-gcf598311ce
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 cf598311ce9c6edb2b7d2a1de945ba7f2418c2fb (commit) from de1d530ef0a638463da87e7a66c26cafc938e986 (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=cf598311ce9c6edb2b7d2a1de945ba7f2418c2fb commit cf598311ce9c6edb2b7d2a1de945ba7f2418c2fb Author: Kitware Robot AuthorDate: Sun Nov 17 00:01:06 2019 -0500 Commit: Kitware Robot CommitDate: Sun Nov 17 00:01:06 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c480167b66..be89acf77a 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 20191116) +set(CMake_VERSION_PATCH 20191117) #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-449-gde1d530ef0
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 de1d530ef0a638463da87e7a66c26cafc938e986 (commit) from 5695b0464b411746b207da2ee23b8e2d9f8ffec2 (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=de1d530ef0a638463da87e7a66c26cafc938e986 commit de1d530ef0a638463da87e7a66c26cafc938e986 Author: Kitware Robot AuthorDate: Sat Nov 16 00:01:09 2019 -0500 Commit: Kitware Robot CommitDate: Sat Nov 16 00:01:09 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f9e3d4afaf..c480167b66 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 20191115) +set(CMake_VERSION_PATCH 20191116) #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-448-g5695b0464b
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 5695b0464b411746b207da2ee23b8e2d9f8ffec2 (commit)
via 2d0100fac7a51327ce8053b4ab2277aaa96c12a5 (commit)
via 5239fc5c753502e91a1ea6859842d7fc24a36253 (commit)
from 1d78e1a966912d35e1dea0e986bc0b977141e880 (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=5695b0464b411746b207da2ee23b8e2d9f8ffec2
commit 5695b0464b411746b207da2ee23b8e2d9f8ffec2
Merge: 1d78e1a966 2d0100fac7
Author: Kyle Edwards
AuthorDate: Fri Nov 15 14:57:38 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 15 09:57:56 2019 -0500
Merge topic 'cmake-e-rm'
2d0100fac7 replace remove and remove_directory with rm in tests
5239fc5c75 cmake -E: Add rm with improved semantics over remove and
remove_directory
Acked-by: Kitware Robot
Merge-request: !3949
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d0100fac7a51327ce8053b4ab2277aaa96c12a5
commit 2d0100fac7a51327ce8053b4ab2277aaa96c12a5
Author: Johnny Jazeix
AuthorDate: Wed Nov 13 22:24:41 2019 +0100
Commit: Kyle Edwards
CommitDate: Wed Nov 13 18:02:18 2019 -0500
replace remove and remove_directory with rm in tests
diff --git a/Modules/CMakeAddFortranSubdirectory.cmake
b/Modules/CMakeAddFortranSubdirectory.cmake
index 2613569d19..09e739dd71 100644
--- a/Modules/CMakeAddFortranSubdirectory.cmake
+++ b/Modules/CMakeAddFortranSubdirectory.cmake
@@ -155,7 +155,7 @@ function(cmake_add_fortran_subdirectory subdir)
# make the external project always run make with each build
externalproject_add_step(${project_name}_build forcebuild
COMMAND ${CMAKE_COMMAND}
--E remove
+-E rm -f
${CMAKE_CURRENT_BUILD_DIR}/${project_name}-prefix/src/${project_name}-stamp/${project_name}-build
DEPENDEES configure
DEPENDERS build
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index cd4e22d4e6..1e542663d0 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1120,7 +1120,7 @@ if(NOT \"${gitclone_infofile}\" IS_NEWER_THAN
\"${gitclone_stampfile}\")
endif()
execute_process(
- COMMAND \${CMAKE_COMMAND} -E remove_directory \"${source_dir}\"
+ COMMAND \${CMAKE_COMMAND} -E rm -rf \"${source_dir}\"
RESULT_VARIABLE error_code
)
if(error_code)
@@ -1196,7 +1196,7 @@ if(NOT \"${hgclone_infofile}\" IS_NEWER_THAN
\"${hgclone_stampfile}\")
endif()
execute_process(
- COMMAND \${CMAKE_COMMAND} -E remove_directory \"${source_dir}\"
+ COMMAND \${CMAKE_COMMAND} -E rm -rf \"${source_dir}\"
RESULT_VARIABLE error_code
)
if(error_code)
@@ -2580,7 +2580,7 @@ function(_ep_add_download_command name)
if(IS_DIRECTORY "${url}")
get_filename_component(abs_dir "${url}" ABSOLUTE)
set(comment "Performing download step (DIR copy) for '${name}'")
- set(cmd ${CMAKE_COMMAND} -E remove_directory ${source_dir}
+ set(cmd ${CMAKE_COMMAND} -E rm -rf ${source_dir}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir})
else()
get_property(no_extract TARGET "${name}" PROPERTY
_EP_DOWNLOAD_NO_EXTRACT SET)
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 85d705c8d6..f1086e7a9e 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -2006,7 +2006,7 @@ macro(CUDA_BUILD_CLEAN_TARGET)
string(TOUPPER ${cuda_clean_target_name} cuda_clean_target_name)
endif()
add_custom_target(${cuda_clean_target_name}
-COMMAND ${CMAKE_COMMAND} -E remove ${CUDA_ADDITIONAL_CLEAN_FILES})
+COMMAND ${CMAKE_COMMAND} -E rm -f ${CUDA_ADDITIONAL_CLEAN_FILES})
# Clear out the variable, so the next time we configure it will be empty.
# This is useful so that the files won't persist in the list after targets
diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake
index af15d55e58..ba3543306b 100644
--- a/Modules/FindCUDA/run_nvcc.cmake
+++ b/Modules/FindCUDA/run_nvcc.cmake
@@ -174,7 +174,7 @@ endmacro()
# Delete the target file
cuda_execute_process(
"Removing ${generated_file}"
- COMMAND "${CMAKE_COMMAND}" -E remove "${generated_file}"
+ COMMAND "${CMAKE_COMMAND}" -E rm -f "${generated_file}"
)
# For CUDA 2.3 and below, -G -M doesn't work, so remove the -G flag
@@ -241,7 +241,7 @@ endif()
# Delete the temporary file
cuda_execute_process(
"Removing ${cmake_dependency_file}.tmp
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-436-gb55f605e70
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 b55f605e70f3186e6611f4f84dc246d39453af03 (commit)
via 4f71b55908739cc20fcb0370031d8c2a07ae6688 (commit)
via 9bc8854b3c1fe41baa5847f41ff4e4d08c2fda36 (commit)
via f8a1b07953e6bf40da7def8459f8327cb007d2a9 (commit)
via 6a818b693192e96f57c866caf2541669342a700b (commit)
via dc01c73f2d187d3a7e20527372f4e2888ffedc0a (commit)
via 78ce959a40c788356e304829d5f93742c5c83fa6 (commit)
from 10f8197400cf0be678444f7400c8739f63096c76 (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=b55f605e70f3186e6611f4f84dc246d39453af03
commit b55f605e70f3186e6611f4f84dc246d39453af03
Merge: 4f71b55908 dc01c73f2d
Author: Brad King
AuthorDate: Fri Nov 15 14:15:22 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 15 09:15:29 2019 -0500
Merge topic 'update-kwsys'
dc01c73f2d Merge branch 'upstream-KWSys' into update-kwsys
78ce959a40 KWSys 2019-11-13 (e67ed8ef)
Acked-by: Kitware Robot
Merge-request: !4047
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f71b55908739cc20fcb0370031d8c2a07ae6688
commit 4f71b55908739cc20fcb0370031d8c2a07ae6688
Merge: 9bc8854b3c f8a1b07953
Author: Brad King
AuthorDate: Fri Nov 15 14:04:19 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 15 09:06:07 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bc8854b3c1fe41baa5847f41ff4e4d08c2fda36
commit 9bc8854b3c1fe41baa5847f41ff4e4d08c2fda36
Merge: 10f8197400 6a818b6931
Author: Brad King
AuthorDate: Fri Nov 15 14:04:19 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 15 09:06:07 2019 -0500
Merge topic 'objc-standard-fix'
6a818b6931 ObjC: Proper initialization of ObjC/XX standard properties
Acked-by: Kitware Robot
Acked-by: Robert Maynard
Merge-request: !4050
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc01c73f2d187d3a7e20527372f4e2888ffedc0a
commit dc01c73f2d187d3a7e20527372f4e2888ffedc0a
Merge: 011693867a 78ce959a40
Author: Brad King
AuthorDate: Wed Nov 13 09:48:23 2019 -0500
Commit: Brad King
CommitDate: Wed Nov 13 09:48:23 2019 -0500
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2019-11-13 (e67ed8ef)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78ce959a40c788356e304829d5f93742c5c83fa6
commit 78ce959a40c788356e304829d5f93742c5c83fa6
Author: KWSys Upstream
AuthorDate: Wed Nov 13 09:47:45 2019 -0500
Commit: Brad King
CommitDate: Wed Nov 13 09:48:22 2019 -0500
KWSys 2019-11-13 (e67ed8ef)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit e67ed8efaf193036a92b648eec2ea71fabc0c05a (master).
Upstream Shortlog
-
Brad King (2):
b019deea RegularExpression: Suppress VS 2013 warning C4351
a5248df0 CTestCustom: Suppress PGI Community Edition compiler license
warnings
Paul Smith (1):
dfd0521e Terminal: Support GNU make's TTY notification environment
variable
Todd Martin (2):
0492cad3 SystemTools: Remove redundant ToWindowsExtendedPath calls
680ab6d2 FStream: Expose is_open publicly
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 760221b124..c07f0f30f8 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -12,3 +12,7 @@
list(APPEND CTEST_CUSTOM_MEMCHECK_IGNORE
kwsys.testProcess-10
)
+
+list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
+ "LICENSE WARNING"
+ )
diff --git a/FStream.hxx.in b/FStream.hxx.in
index d79bbdf16b..b424488920 100644
--- a/FStream.hxx.in
+++ b/FStream.hxx.in
@@ -87,7 +87,7 @@ public:
bool _open(char const* file_name, std::ios_base::openmode mode)
{
-if (is_open() || file_) {
+if (_is_open() || file_) {
return false;
}
# if defined(_MSC_VER)
@@ -108,7 +108,7 @@ public:
return success;
}
- bool is_open()
+ bool _is_open()
{
if (!buf_) {
return false;
@@ -116,7 +116,7 @@ public:
return buf_->is_open();
}
- bool is_open() const
+ bool _is_open() const
{
if (!buf_) {
return false;
@@ -198,9 +198,11 @@ public:
this->_set_state(this->_open(file_name, mode), this, this);
}
+ bool is_open() { return this->_is_open(); }
+
void close() { this->_set_state(this->_close(), this, this); }
- using basic_efilebuf::is_open;
+
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-109-gf8a1b07953
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 f8a1b07953e6bf40da7def8459f8327cb007d2a9 (commit) via 6a818b693192e96f57c866caf2541669342a700b (commit) from 330b7b01909e5a6fda0b6fc89f2775953cf6cdc8 (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/cmLocalGenerator.cxx | 43 +-- 1 file changed, 29 insertions(+), 14 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-429-g10f8197400
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 10f8197400cf0be678444f7400c8739f63096c76 (commit)
via ee200b7d96d3256c744077ef3aae9f2de8621974 (commit)
via 330b7b01909e5a6fda0b6fc89f2775953cf6cdc8 (commit)
via 18bacbd94814b7a0750b162161e803410a5cb1bb (commit)
via 8a3143bad53ef8cc3815dc6b84544980dd1d1f8d (commit)
via 7ee73962ec3382e5378c1ba98e029e9207e30c14 (commit)
via 6f818de28726c45c27690918eabdb6682330d9d8 (commit)
via c029829665cd4e3dac4fae71aa47c1d654e8ba47 (commit)
via 25d7a72a9391f776ed2a86672814cce7f1ab3a2a (commit)
via d2e5e6ff1abec8b3b1579f122b7dcc89a35dbba4 (commit)
via e8bd920df1c149310fc72f2c7e8d359b477ce42f (commit)
via 24ae45fb0c9068a1798eb8c5c5d49b5f2639b145 (commit)
from a10e11fd7c36a2086223384d35f3d5325ef84f05 (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=10f8197400cf0be678444f7400c8739f63096c76
commit 10f8197400cf0be678444f7400c8739f63096c76
Merge: ee200b7d96 330b7b0190
Author: Brad King
AuthorDate: Fri Nov 15 14:03:38 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 15 09:04:41 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee200b7d96d3256c744077ef3aae9f2de8621974
commit ee200b7d96d3256c744077ef3aae9f2de8621974
Merge: 18bacbd948 d2e5e6ff1a
Author: Brad King
AuthorDate: Fri Nov 15 14:03:38 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 15 09:04:40 2019 -0500
Merge topic 'objc-tests'
d2e5e6ff1a Tests: Organize Objective C/C++ test directories
Acked-by: Kitware Robot
Merge-request: !4051
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18bacbd94814b7a0750b162161e803410a5cb1bb
commit 18bacbd94814b7a0750b162161e803410a5cb1bb
Merge: 7ee73962ec 8a3143bad5
Author: Brad King
AuthorDate: Fri Nov 15 14:03:03 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 15 09:03:17 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ee73962ec3382e5378c1ba98e029e9207e30c14
commit 7ee73962ec3382e5378c1ba98e029e9207e30c14
Merge: 6f818de287 e8bd920df1
Author: Brad King
AuthorDate: Fri Nov 15 14:03:03 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 15 09:03:17 2019 -0500
Merge topic 'fix-optional-test'
e8bd920df1 Tests: Fix reliance on undefined behavior of cm::optional
Acked-by: Kitware Robot
Acked-by: Ben Boeckel
Merge-request: !4049
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f818de28726c45c27690918eabdb6682330d9d8
commit 6f818de28726c45c27690918eabdb6682330d9d8
Merge: c029829665 25d7a72a93
Author: Brad King
AuthorDate: Fri Nov 15 14:01:22 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 15 09:01:38 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c029829665cd4e3dac4fae71aa47c1d654e8ba47
commit c029829665cd4e3dac4fae71aa47c1d654e8ba47
Merge: a10e11fd7c 24ae45fb0c
Author: Brad King
AuthorDate: Fri Nov 15 14:01:22 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 15 09:01:37 2019 -0500
Merge topic 'FindPostgreSQL-macports-libsuffix'
24ae45fb0c FindPostgreSQL: also search for libraries in the MacPorts suffix
Acked-by: Kitware Robot
Merge-request: !4043
---
Summary of changes:
Modules/FindPostgreSQL.cmake | 1 +
Tests/CMakeLib/testOptional.cxx| 84 -
Tests/CMakeLists.txt | 88 +-
Tests/ObjC/CMakeLists.txt | 4 +
.../c-file-extension-test/CMakeLists.txt | 0
.../c-file-extension-test/main.m | 0
.../cxx-file-extension-test/CMakeLists.txt | 0
.../cxx-file-extension-test/main.m | 0
.../objc-file-extension-test/CMakeLists.txt| 0
.../objc-file-extension-test/main.m| 0
.../simple-build-test/CMakeLists.txt | 0
.../simple-build-test/foo.h| 0
.../{Objective-C => ObjC}/simple-build-test/foo.m | 0
.../{Objective-C => ObjC}/simple-build-test/main.m | 0
Tests/ObjCXX/CMakeLists.txt| 4 +
Tests/{ => ObjCXX}/ObjC++/CMakeLists.txt | 1 -
Tests/{ => ObjCXX}/ObjC++/objc++.mm| 0
.../cxx-file-extension-test/CMakeLists.txt | 0
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-107-g330b7b0190
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 330b7b01909e5a6fda0b6fc89f2775953cf6cdc8 (commit)
via 8a3143bad53ef8cc3815dc6b84544980dd1d1f8d (commit)
via 25d7a72a9391f776ed2a86672814cce7f1ab3a2a (commit)
via d2e5e6ff1abec8b3b1579f122b7dcc89a35dbba4 (commit)
via e8bd920df1c149310fc72f2c7e8d359b477ce42f (commit)
via 24ae45fb0c9068a1798eb8c5c5d49b5f2639b145 (commit)
from 842605341a6d1c3ca4fe4650f0f1572631cfc6a5 (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/FindPostgreSQL.cmake | 1 +
Tests/CMakeLib/testOptional.cxx| 84 -
Tests/CMakeLists.txt | 88 +-
Tests/ObjC/CMakeLists.txt | 4 +
.../c-file-extension-test/CMakeLists.txt | 0
.../c-file-extension-test/main.m | 0
.../cxx-file-extension-test/CMakeLists.txt | 0
.../cxx-file-extension-test/main.m | 0
.../objc-file-extension-test/CMakeLists.txt| 0
.../objc-file-extension-test/main.m| 0
.../simple-build-test/CMakeLists.txt | 0
.../simple-build-test/foo.h| 0
.../{Objective-C => ObjC}/simple-build-test/foo.m | 0
.../{Objective-C => ObjC}/simple-build-test/main.m | 0
Tests/ObjCXX/CMakeLists.txt| 4 +
Tests/{ => ObjCXX}/ObjC++/CMakeLists.txt | 1 -
Tests/{ => ObjCXX}/ObjC++/objc++.mm| 0
.../cxx-file-extension-test/CMakeLists.txt | 0
.../cxx-file-extension-test/main.mm| 0
.../objcxx-file-extension-test/CMakeLists.txt | 0
.../objcxx-file-extension-test/main.mm | 0
.../simple-build-test/CMakeLists.txt | 0
.../simple-build-test/foo.h| 0
.../simple-build-test/foo.mm | 0
.../simple-build-test/main.mm | 0
25 files changed, 59 insertions(+), 123 deletions(-)
create mode 100644 Tests/ObjC/CMakeLists.txt
rename Tests/{Objective-C => ObjC}/c-file-extension-test/CMakeLists.txt (100%)
rename Tests/{Objective-C => ObjC}/c-file-extension-test/main.m (100%)
rename Tests/{Objective-C => ObjC}/cxx-file-extension-test/CMakeLists.txt
(100%)
rename Tests/{Objective-C => ObjC}/cxx-file-extension-test/main.m (100%)
rename Tests/{Objective-C => ObjC}/objc-file-extension-test/CMakeLists.txt
(100%)
rename Tests/{Objective-C => ObjC}/objc-file-extension-test/main.m (100%)
rename Tests/{Objective-C => ObjC}/simple-build-test/CMakeLists.txt (100%)
rename Tests/{Objective-C++ => ObjC}/simple-build-test/foo.h (100%)
rename Tests/{Objective-C => ObjC}/simple-build-test/foo.m (100%)
rename Tests/{Objective-C => ObjC}/simple-build-test/main.m (100%)
create mode 100644 Tests/ObjCXX/CMakeLists.txt
rename Tests/{ => ObjCXX}/ObjC++/CMakeLists.txt (99%)
rename Tests/{ => ObjCXX}/ObjC++/objc++.mm (100%)
rename Tests/{Objective-C++ => ObjCXX}/cxx-file-extension-test/CMakeLists.txt
(100%)
rename Tests/{Objective-C++ => ObjCXX}/cxx-file-extension-test/main.mm (100%)
rename Tests/{Objective-C++ =>
ObjCXX}/objcxx-file-extension-test/CMakeLists.txt (100%)
rename Tests/{Objective-C++ => ObjCXX}/objcxx-file-extension-test/main.mm
(100%)
rename Tests/{Objective-C++ => ObjCXX}/simple-build-test/CMakeLists.txt (100%)
rename Tests/{Objective-C => ObjCXX}/simple-build-test/foo.h (100%)
rename Tests/{Objective-C++ => ObjCXX}/simple-build-test/foo.mm (100%)
rename Tests/{Objective-C++ => ObjCXX}/simple-build-test/main.mm (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-417-ga10e11fd7c
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 a10e11fd7c36a2086223384d35f3d5325ef84f05 (commit) from aeb95264e02252aba705166dfb8410baff0e715d (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=a10e11fd7c36a2086223384d35f3d5325ef84f05 commit a10e11fd7c36a2086223384d35f3d5325ef84f05 Author: Kitware Robot AuthorDate: Fri Nov 15 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Fri Nov 15 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3cdadcbb36..f9e3d4afaf 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 20191114) +set(CMake_VERSION_PATCH 20191115) #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-416-gaeb95264e0
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 aeb95264e02252aba705166dfb8410baff0e715d (commit) from 011693867ac0ee81912cca8e2289b9c584ccfb9b (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=aeb95264e02252aba705166dfb8410baff0e715d commit aeb95264e02252aba705166dfb8410baff0e715d Author: Kitware Robot AuthorDate: Thu Nov 14 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Thu Nov 14 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d5688932a5..3cdadcbb36 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 20191113) +set(CMake_VERSION_PATCH 20191114) #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-101-g842605341a
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 842605341a6d1c3ca4fe4650f0f1572631cfc6a5 (commit) via c921ec6112961304824b6bbdf7fb743f676325d0 (commit) via 786954c4893565d8da27329201fd235e347e051d (commit) via a0212382c98c9e76190892ba76441ed2668ec6ba (commit) via a1216139f800a403fa04478a79162d2ca0c6a2f8 (commit) via 81566557d591bf375384ca3e697877ba67c2f77d (commit) via fe54989fcdd03a1f9bd674b31bac3a95a52a0fd5 (commit) via a27a1c7e881f9381c38a7f17fa29fc537a274c9a (commit) from 28bc41ca62b00d5c265c83436f317f970a4b9a93 (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/CMakeSwiftInformation.cmake | 1 + Modules/FindwxWidgets.cmake | 50 - Source/cmLocalGenerator.cxx | 29 + 3 files changed, 57 insertions(+), 23 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-415-g011693867a
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 011693867ac0ee81912cca8e2289b9c584ccfb9b (commit)
via 1257fc91ff63f58692033ee16061aa35a51dc735 (commit)
via 842605341a6d1c3ca4fe4650f0f1572631cfc6a5 (commit)
via c921ec6112961304824b6bbdf7fb743f676325d0 (commit)
via cad199d4b290af947bae0075da37cfb3a66eafdd (commit)
via 786954c4893565d8da27329201fd235e347e051d (commit)
via 3c0428906a3e207ee41d2cce63459d61e23803c7 (commit)
via 4909594abdb768b89c7fb30d0693df7f05c54465 (commit)
via c104c3eec2184426b4e83420d25be207cdec90f5 (commit)
via a0212382c98c9e76190892ba76441ed2668ec6ba (commit)
via 61c97c8eb23d338cc96674a961b27217ba18 (commit)
via 314c9c143dac4af1516f7f389e688d0d41d8d369 (commit)
via e42c018642b953cc6dbfe4e9ccb4639e7f1e6f1a (commit)
via a1216139f800a403fa04478a79162d2ca0c6a2f8 (commit)
via 81566557d591bf375384ca3e697877ba67c2f77d (commit)
via fe54989fcdd03a1f9bd674b31bac3a95a52a0fd5 (commit)
via a27a1c7e881f9381c38a7f17fa29fc537a274c9a (commit)
via 64843b17375c6ffd8b46ddaa9272e3ad27b6adec (commit)
from e49d85ae4b5397ec33bcfc6bc7984fedd7dcff11 (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=011693867ac0ee81912cca8e2289b9c584ccfb9b
commit 011693867ac0ee81912cca8e2289b9c584ccfb9b
Merge: 1257fc91ff 842605341a
Author: Brad King
AuthorDate: Wed Nov 13 14:43:59 2019 +
Commit: Kitware Robot
CommitDate: Wed Nov 13 09:44:09 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1257fc91ff63f58692033ee16061aa35a51dc735
commit 1257fc91ff63f58692033ee16061aa35a51dc735
Merge: cad199d4b2 c921ec6112
Author: Brad King
AuthorDate: Wed Nov 13 14:43:59 2019 +
Commit: Kitware Robot
CommitDate: Wed Nov 13 09:44:08 2019 -0500
Merge topic 'FindwxWidgets-mingw'
c921ec6112 FindwxWidgets: Add link dependencies for MinGW
Acked-by: Kitware Robot
Merge-request: !4040
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cad199d4b290af947bae0075da37cfb3a66eafdd
commit cad199d4b290af947bae0075da37cfb3a66eafdd
Merge: 3c0428906a 64843b1737
Author: Brad King
AuthorDate: Wed Nov 13 14:41:53 2019 +
Commit: Kitware Robot
CommitDate: Wed Nov 13 09:42:02 2019 -0500
Merge topic 'tag-std-string'
64843b1737 cmVisualStudio10TargetGenerator: use std::string for tag
Acked-by: Kitware Robot
Merge-request: !4026
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c0428906a3e207ee41d2cce63459d61e23803c7
commit 3c0428906a3e207ee41d2cce63459d61e23803c7
Merge: 4909594abd 786954c489
Author: Brad King
AuthorDate: Wed Nov 13 14:38:31 2019 +
Commit: Kitware Robot
CommitDate: Wed Nov 13 09:40:47 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4909594abdb768b89c7fb30d0693df7f05c54465
commit 4909594abdb768b89c7fb30d0693df7f05c54465
Merge: c104c3eec2 81566557d5
Author: Brad King
AuthorDate: Wed Nov 13 14:38:31 2019 +
Commit: Kitware Robot
CommitDate: Wed Nov 13 09:40:47 2019 -0500
Merge topic 'objc-standard'
81566557d5 ObjC: Initialize ObjC/XX standard properties from C/C++
counterparts
Acked-by: Kitware Robot
Merge-request: !4022
diff --cc Source/cmLocalGenerator.cxx
index f8d43181ff,5f8b92089a..f2bf0796d8
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@@ -693,9 -693,19 +693,19 @@@ bool cmLocalGenerator::ComputeTargetCom
configNames.emplace_back();
}
+ using LanguagePair = std::pair;
+ std::vector pairedLanguages{ { "OBJC", "C" },
+ { "OBJCXX", "CXX" } };
+ std::set objcEnabledLanguages;
+ for (auto const& lang : pairedLanguages) {
+ if (this->Makefile->GetState()->GetLanguageEnabled(lang.first)) {
+ objcEnabledLanguages.insert(lang);
+ }
+ }
+
// Process compile features of all targets.
- const std::vector& targets =
this->GetGeneratorTargets();
- for (cmGeneratorTarget* target : targets) {
+ const auto& targets = this->GetGeneratorTargets();
+ for (const auto& target : targets) {
for (std::string const& c : configNames) {
if (!target->ComputeCompileFeatures(c)) {
return false;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c104c3eec2184426b4e83420d25be207cdec90f5
commit c104c3eec2184426b
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-397-ge49d85ae4b
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 e49d85ae4b5397ec33bcfc6bc7984fedd7dcff11 (commit) from aa3b99d58048500c3b24881998b31653178f43ff (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=e49d85ae4b5397ec33bcfc6bc7984fedd7dcff11 commit e49d85ae4b5397ec33bcfc6bc7984fedd7dcff11 Author: Kitware Robot AuthorDate: Wed Nov 13 00:01:10 2019 -0500 Commit: Kitware Robot CommitDate: Wed Nov 13 00:01:10 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 41bde355a6..d5688932a5 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 20191112) +set(CMake_VERSION_PATCH 20191113) #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-93-g28bc41ca62
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 28bc41ca62b00d5c265c83436f317f970a4b9a93 (commit) via 64f40c5d098c58de99bf9335b85ca97971ecf02e (commit) from eae743bf17605c28ee4afd02991d3271efb5c8a9 (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/add_custom_command.rst | 3 ++- 1 file changed, 2 insertions(+), 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-396-gaa3b99d580
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 aa3b99d58048500c3b24881998b31653178f43ff (commit)
via 7e62ffc028cbaea17d5dc19d5dd4c2f5fcbfa137 (commit)
via 28bc41ca62b00d5c265c83436f317f970a4b9a93 (commit)
via 64f40c5d098c58de99bf9335b85ca97971ecf02e (commit)
from ccd2c2824aea342b66adde1001753181375c49dc (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=aa3b99d58048500c3b24881998b31653178f43ff
commit aa3b99d58048500c3b24881998b31653178f43ff
Merge: 7e62ffc028 28bc41ca62
Author: Kyle Edwards
AuthorDate: Tue Nov 12 15:01:51 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 10:02:01 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e62ffc028cbaea17d5dc19d5dd4c2f5fcbfa137
commit 7e62ffc028cbaea17d5dc19d5dd4c2f5fcbfa137
Merge: ccd2c2824a 64f40c5d09
Author: Kyle Edwards
AuthorDate: Tue Nov 12 15:01:51 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 10:02:01 2019 -0500
Merge topic 'add_custom_command-supports-COMMAND_EXPAND_LISTS'
64f40c5d09 Help: Both add_custom_command signatures support
COMMAND_EXPAND_LISTS
Acked-by: Kitware Robot
Merge-request: !4036
---
Summary of changes:
Help/command/add_custom_command.rst | 3 ++-
1 file changed, 2 insertions(+), 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-392-gccd2c2824a
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 ccd2c2824aea342b66adde1001753181375c49dc (commit)
via aec81b301ecf82f7b131d9d49d67d9b6be82a13a (commit)
via f59ae1a698561657afa32245f9c8f3fc90aa392d (commit)
via cea7f88a54f060b8c4720f0d20432f7cf4bd8d56 (commit)
via 5b46bc319435f429e3e616246e5e39b06f0e7fd0 (commit)
via eae743bf17605c28ee4afd02991d3271efb5c8a9 (commit)
via 45f8b10e0c12b3e17315851afd1bcd178225ce6a (commit)
via 88e0dca40df9c88e7d9b9d352fe19f63091bc7c3 (commit)
via 55f7df4961ef3ae4dd01eaae3be149f5c8798e11 (commit)
via 46371132b3d79d2a4c86ee2a99b7a0fed4367750 (commit)
via f93385283fc86639c0a13b920c66c3a8f42276bb (commit)
via 665954fa8d2d2e0a74aab78b7d739c0feae5211b (commit)
via 9a5418320ea40d61a63fd47e5ac133c3ff780062 (commit)
via 101b5288ffa988b86fc1fe83f3ff65c9694b1484 (commit)
via e6069613a111ff30e9bb9a0e7294b2ea9da574c1 (commit)
from 2af4841428b7d7e5303d0a0afc3e55958214e22c (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=ccd2c2824aea342b66adde1001753181375c49dc
commit ccd2c2824aea342b66adde1001753181375c49dc
Merge: aec81b301e f93385283f
Author: Brad King
AuthorDate: Tue Nov 12 14:55:10 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:55:20 2019 -0500
Merge topic 'modernize-memory-management'
f93385283f cmLocalGenerator: modernize memory management
101b5288ff cmAlgorithm: Extend cmAppend capabilities
Acked-by: Kitware Robot
Merge-request: !4028
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aec81b301ecf82f7b131d9d49d67d9b6be82a13a
commit aec81b301ecf82f7b131d9d49d67d9b6be82a13a
Merge: f59ae1a698 46371132b3
Author: Brad King
AuthorDate: Tue Nov 12 14:52:03 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:53:42 2019 -0500
Merge topic 'findcuda_stop_exposing_raw_pthreads_lib'
46371132b3 FindCUDA: CUDA_LIBRARIES doesn't contain raw `-pthread`
Acked-by: Kitware Robot
Merge-request: !4035
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f59ae1a698561657afa32245f9c8f3fc90aa392d
commit f59ae1a698561657afa32245f9c8f3fc90aa392d
Merge: cea7f88a54 e6069613a1
Author: Brad King
AuthorDate: Tue Nov 12 14:51:47 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:52:32 2019 -0500
Merge topic 'cpack-pkg-background'
e6069613a1 CPack: Set background image in macOS installer
Acked-by: Kitware Robot
Merge-request: !3995
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cea7f88a54f060b8c4720f0d20432f7cf4bd8d56
commit cea7f88a54f060b8c4720f0d20432f7cf4bd8d56
Merge: 5b46bc3194 eae743bf17
Author: Brad King
AuthorDate: Tue Nov 12 14:51:05 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:51:16 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b46bc319435f429e3e616246e5e39b06f0e7fd0
commit 5b46bc319435f429e3e616246e5e39b06f0e7fd0
Merge: 45f8b10e0c 9a5418320e
Author: Brad King
AuthorDate: Tue Nov 12 14:51:05 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:51:16 2019 -0500
Merge topic 'unity-HEADER_FILE_ONLY'
9a5418320e Unity: Don't include sources with HEADER_FILE_ONLY property set
Acked-by: Kitware Robot
Merge-request: !4023
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45f8b10e0c12b3e17315851afd1bcd178225ce6a
commit 45f8b10e0c12b3e17315851afd1bcd178225ce6a
Merge: 55f7df4961 88e0dca40d
Author: Brad King
AuthorDate: Tue Nov 12 14:47:35 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:47:44 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55f7df4961ef3ae4dd01eaae3be149f5c8798e11
commit 55f7df4961ef3ae4dd01eaae3be149f5c8798e11
Merge: 2af4841428 665954fa8d
Author: Brad King
AuthorDate: Tue Nov 12 14:47:35 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:47:44 2019 -0500
Merge topic 'objc-standard-docs'
665954fa8d ObjC: Document ObjC/ObjCXX standard properties / variables
Acked-by: Kitware Robot
Merge-request: !4031
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46371132b3d79d2a4c86ee2a99b7a0fed4367750
commit 46371132b3d79d2a4c86ee2a99b7a0fed4367750
Author: Robert Maynard
AuthorDate: Mon Nov 11 11:49:52 2019 -0500
Commit: Robert Maynard
CommitDate: Mon Nov 11 11:52:02 2019 -0500
FindCUDA: CUDA_LIBRA
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-91-geae743bf17
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 eae743bf17605c28ee4afd02991d3271efb5c8a9 (commit) via 88e0dca40df9c88e7d9b9d352fe19f63091bc7c3 (commit) via 665954fa8d2d2e0a74aab78b7d739c0feae5211b (commit) via 9a5418320ea40d61a63fd47e5ac133c3ff780062 (commit) from b197d20c083da1cbfd32e79c4a4c8f36de3a6aae (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/try_compile.rst | 11 ++- Help/manual/cmake-properties.7.rst | 6 Help/manual/cmake-variables.7.rst | 6 Help/prop_tgt/OBJCXX_EXTENSIONS.rst| 20 + Help/prop_tgt/OBJCXX_STANDARD.rst | 35 ++ Help/prop_tgt/OBJCXX_STANDARD_REQUIRED.rst | 20 + Help/prop_tgt/OBJC_EXTENSIONS.rst | 20 + Help/prop_tgt/OBJC_STANDARD.rst| 35 ++ Help/prop_tgt/OBJC_STANDARD_REQUIRED.rst | 20 + Help/variable/CMAKE_OBJCXX_EXTENSIONS.rst | 11 +++ Help/variable/CMAKE_OBJCXX_STANDARD.rst| 11 +++ Help/variable/CMAKE_OBJCXX_STANDARD_REQUIRED.rst | 11 +++ Help/variable/CMAKE_OBJC_EXTENSIONS.rst| 11 +++ Help/variable/CMAKE_OBJC_STANDARD.rst | 11 +++ Help/variable/CMAKE_OBJC_STANDARD_REQUIRED.rst | 11 +++ Source/cmFileAPICodemodel.cxx | 1 + Source/cmGeneratorTarget.cxx | 19 Source/cmGeneratorTarget.h | 9 +- Source/cmGlobalXCodeGenerator.cxx | 4 ++- Source/cmLocalGenerator.cxx| 6 ++-- Source/cmVisualStudio10TargetGenerator.cxx | 1 + Tests/RunCMake/UnityBuild/unitybuild_runtest.cmake | 1 + .../UnityBuild/unitybuild_skip-check.cmake | 6 ++-- Tests/RunCMake/UnityBuild/unitybuild_skip.cmake| 5 +++- 24 files changed, 281 insertions(+), 10 deletions(-) create mode 100644 Help/prop_tgt/OBJCXX_EXTENSIONS.rst create mode 100644 Help/prop_tgt/OBJCXX_STANDARD.rst create mode 100644 Help/prop_tgt/OBJCXX_STANDARD_REQUIRED.rst create mode 100644 Help/prop_tgt/OBJC_EXTENSIONS.rst create mode 100644 Help/prop_tgt/OBJC_STANDARD.rst create mode 100644 Help/prop_tgt/OBJC_STANDARD_REQUIRED.rst create mode 100644 Help/variable/CMAKE_OBJCXX_EXTENSIONS.rst create mode 100644 Help/variable/CMAKE_OBJCXX_STANDARD.rst create mode 100644 Help/variable/CMAKE_OBJCXX_STANDARD_REQUIRED.rst create mode 100644 Help/variable/CMAKE_OBJC_EXTENSIONS.rst create mode 100644 Help/variable/CMAKE_OBJC_STANDARD.rst create mode 100644 Help/variable/CMAKE_OBJC_STANDARD_REQUIRED.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-377-g2af4841428
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 2af4841428b7d7e5303d0a0afc3e55958214e22c (commit)
via 43ef704d51af61427ea856634731acd031bda646 (commit)
via b197d20c083da1cbfd32e79c4a4c8f36de3a6aae (commit)
via 44f4042f89900229e3442eb45b1196ece63c8652 (commit)
via 11c83957acc6d8d1143834aa8dce0c14496ba199 (commit)
via c4708c5928a1476d9fe1c35856552994042ee7f0 (commit)
via bb42e1ed43cc56581e7d16ec93a417b7971d108b (commit)
via 50bc359184472700e9776a0a9d6f7e06ea82b9ce (commit)
via b63a5c88a2089494e53f22f83db1925435161934 (commit)
via 1712885b4f68093e4e30e5e9e979ac0611030608 (commit)
via 512fabaa9d8a864ee212664df1bfddf112f5d79b (commit)
from 2644ea3c2123c374558b8007fe97e7e9838ca1a2 (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=2af4841428b7d7e5303d0a0afc3e55958214e22c
commit 2af4841428b7d7e5303d0a0afc3e55958214e22c
Merge: 43ef704d51 b197d20c08
Author: Brad King
AuthorDate: Tue Nov 12 14:43:00 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:43:12 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43ef704d51af61427ea856634731acd031bda646
commit 43ef704d51af61427ea856634731acd031bda646
Merge: 44f4042f89 bb42e1ed43
Author: Brad King
AuthorDate: Tue Nov 12 14:43:00 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:43:11 2019 -0500
Merge topic 'objc-xcode-flags'
bb42e1ed43 ObjC: Add OBJC/OBJCXX flags to Xcode projects
Acked-by: Kitware Robot
Merge-request: !4020
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44f4042f89900229e3442eb45b1196ece63c8652
commit 44f4042f89900229e3442eb45b1196ece63c8652
Merge: 11c83957ac c4708c5928
Author: Brad King
AuthorDate: Tue Nov 12 14:36:18 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:38:22 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11c83957acc6d8d1143834aa8dce0c14496ba199
commit 11c83957acc6d8d1143834aa8dce0c14496ba199
Merge: 2644ea3c21 50bc359184
Author: Brad King
AuthorDate: Tue Nov 12 14:36:18 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:38:22 2019 -0500
Merge topic 'update-expat'
50bc359184 expat: Update CMake build for 2.2.9
b63a5c88a2 Merge branch 'upstream-expat' into update-expat
1712885b4f expat 2019-09-25 (a7bc26b6)
512fabaa9d expat: Update script to get Expat 2.2.9
Acked-by: Kitware Robot
Merge-request: !4032
---
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 25 +-
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 14 +
Tests/RunCMake/XcodeProject/XcodeObjcFlags.cmake | 12 +
Tests/RunCMake/XcodeProject/XcodeObjcxxFlags.cmake | 12 +
Tests/RunCMake/XcodeProject/myfuncs.m |3 +
Tests/RunCMake/XcodeProject/myfuncs.mm |3 +
Utilities/Scripts/update-expat.bash|3 +-
Utilities/cmexpat/CMakeLists.txt |1 -
Utilities/cmexpat/ConfigureChecks.cmake|5 +-
Utilities/cmexpat/README.md| 63 +-
Utilities/cmexpat/expat_config.h.cmake | 22 +-
Utilities/cmexpat/lib/asciitab.h | 62 +-
Utilities/cmexpat/lib/expat.h | 275 +-
Utilities/cmexpat/lib/expat_external.h | 87 +-
Utilities/cmexpat/lib/iasciitab.h | 62 +-
Utilities/cmexpat/lib/internal.h | 48 +-
Utilities/cmexpat/lib/latin1tab.h | 62 +-
Utilities/cmexpat/lib/loadlibrary.c| 143 -
Utilities/cmexpat/lib/nametab.h| 242 +-
Utilities/cmexpat/lib/siphash.h| 433 +--
Utilities/cmexpat/lib/utf8tab.h| 62 +-
Utilities/cmexpat/lib/winconfig.h | 16 +-
Utilities/cmexpat/lib/xmlparse.c | 3795 +---
Utilities/cmexpat/lib/xmlrole.c| 747 ++--
Utilities/cmexpat/lib/xmlrole.h| 13 +-
Utilities/cmexpat/lib/xmltok.c | 1372 ---
Utilities/cmexpat/lib/xmltok.h | 212 +-
Utilities/cmexpat/lib/xmltok_impl.c| 999 +++---
Utilities/cmexpat/lib/xmltok_impl.h| 72 +-
Utilities/cmexpat/lib/xmltok_ns.c | 84 +-
30 files change
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-87-gb197d20c08
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 b197d20c083da1cbfd32e79c4a4c8f36de3a6aae (commit) via c4708c5928a1476d9fe1c35856552994042ee7f0 (commit) via bb42e1ed43cc56581e7d16ec93a417b7971d108b (commit) via 50bc359184472700e9776a0a9d6f7e06ea82b9ce (commit) via b63a5c88a2089494e53f22f83db1925435161934 (commit) via 1712885b4f68093e4e30e5e9e979ac0611030608 (commit) via 512fabaa9d8a864ee212664df1bfddf112f5d79b (commit) from f90c351e601a98ddb10822d6973dd2fcc140e13e (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/cmGlobalXCodeGenerator.cxx | 25 +- Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 14 + Tests/RunCMake/XcodeProject/XcodeObjcFlags.cmake | 12 + Tests/RunCMake/XcodeProject/XcodeObjcxxFlags.cmake | 12 + Tests/RunCMake/XcodeProject/myfuncs.m |3 + Tests/RunCMake/XcodeProject/myfuncs.mm |3 + Utilities/Scripts/update-expat.bash|3 +- Utilities/cmexpat/CMakeLists.txt |1 - Utilities/cmexpat/ConfigureChecks.cmake|5 +- Utilities/cmexpat/README.md| 63 +- Utilities/cmexpat/expat_config.h.cmake | 22 +- Utilities/cmexpat/lib/asciitab.h | 62 +- Utilities/cmexpat/lib/expat.h | 275 +- Utilities/cmexpat/lib/expat_external.h | 87 +- Utilities/cmexpat/lib/iasciitab.h | 62 +- Utilities/cmexpat/lib/internal.h | 48 +- Utilities/cmexpat/lib/latin1tab.h | 62 +- Utilities/cmexpat/lib/loadlibrary.c| 143 - Utilities/cmexpat/lib/nametab.h| 242 +- Utilities/cmexpat/lib/siphash.h| 433 +-- Utilities/cmexpat/lib/utf8tab.h| 62 +- Utilities/cmexpat/lib/winconfig.h | 16 +- Utilities/cmexpat/lib/xmlparse.c | 3795 +--- Utilities/cmexpat/lib/xmlrole.c| 747 ++-- Utilities/cmexpat/lib/xmlrole.h| 13 +- Utilities/cmexpat/lib/xmltok.c | 1372 --- Utilities/cmexpat/lib/xmltok.h | 212 +- Utilities/cmexpat/lib/xmltok_impl.c| 999 +++--- Utilities/cmexpat/lib/xmltok_impl.h| 72 +- Utilities/cmexpat/lib/xmltok_ns.c | 84 +- 30 files changed, 4098 insertions(+), 4851 deletions(-) create mode 100644 Tests/RunCMake/XcodeProject/XcodeObjcFlags.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodeObjcxxFlags.cmake create mode 100644 Tests/RunCMake/XcodeProject/myfuncs.m create mode 100644 Tests/RunCMake/XcodeProject/myfuncs.mm delete mode 100644 Utilities/cmexpat/lib/loadlibrary.c 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-365-g2644ea3c21
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 2644ea3c2123c374558b8007fe97e7e9838ca1a2 (commit)
via df3baee8ffe28aec707ebd720370445e0e570fc2 (commit)
via f90c351e601a98ddb10822d6973dd2fcc140e13e (commit)
via ace0591473294dcefaeadf8ea2608288d2525cd9 (commit)
via ffa9965700cfebce4ea80b5b1a191a5d19c85a29 (commit)
via e2c3da8d4b13e4901eca325420be5c1361609604 (commit)
via 1ade15e1a3757b4ab3dad50cfe1c2381bb6575b4 (commit)
via 7a08f0d8dd7c4337c397b1227c2d3792c2a21215 (commit)
via a085648de59f152beebe190622a42eefc5eb84f0 (commit)
via 2944bf46d53b1581b436c675650987bb3d42b3f2 (commit)
via 77a8f9ecbcf6458eb07e91a12035a34532d53c7c (commit)
via 48d1456b3d2f180acb3afba26a480f3b72fd3ddd (commit)
via ec2f130aa9bf97860789c524c0b9902856e4bf18 (commit)
from c96ba58a5bfee1b98cfcef188b716aca72e406df (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=2644ea3c2123c374558b8007fe97e7e9838ca1a2
commit 2644ea3c2123c374558b8007fe97e7e9838ca1a2
Merge: df3baee8ff f90c351e60
Author: Brad King
AuthorDate: Tue Nov 12 14:35:45 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:36:55 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df3baee8ffe28aec707ebd720370445e0e570fc2
commit df3baee8ffe28aec707ebd720370445e0e570fc2
Merge: ace0591473 2944bf46d5
Author: Brad King
AuthorDate: Tue Nov 12 14:35:45 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:36:55 2019 -0500
Merge topic 'reference-IMPORTED_IMPLIB-more'
2944bf46d5 Help: Reference IMPORTED_IMPLIB from the IMPORTED_LOCATION
documentation
Acked-by: Kitware Robot
Merge-request: !4034
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ace0591473294dcefaeadf8ea2608288d2525cd9
commit ace0591473294dcefaeadf8ea2608288d2525cd9
Merge: e2c3da8d4b ffa9965700
Author: Brad King
AuthorDate: Tue Nov 12 14:34:36 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:35:38 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2c3da8d4b13e4901eca325420be5c1361609604
commit e2c3da8d4b13e4901eca325420be5c1361609604
Merge: 1ade15e1a3 77a8f9ecbc
Author: Brad King
AuthorDate: Tue Nov 12 14:34:36 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:35:38 2019 -0500
Merge topic 'pch-cray-classic'
77a8f9ecbc Tests: Fix ExportImport PCH expectation on Cray Classic compiler
Acked-by: Kitware Robot
Merge-request: !4033
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ade15e1a3757b4ab3dad50cfe1c2381bb6575b4
commit 1ade15e1a3757b4ab3dad50cfe1c2381bb6575b4
Merge: a085648de5 7a08f0d8dd
Author: Brad King
AuthorDate: Tue Nov 12 14:34:00 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:34:12 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a085648de59f152beebe190622a42eefc5eb84f0
commit a085648de59f152beebe190622a42eefc5eb84f0
Merge: c96ba58a5b 48d1456b3d
Author: Brad King
AuthorDate: Tue Nov 12 14:34:00 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 09:34:11 2019 -0500
Merge topic 'resolve-full-path-at-generate-time'
48d1456b3d UnityBuild: Resolve full paths of unity source includes
ec2f130aa9 cmFileAPI: Resolve full path in PCH source comparison
Acked-by: Kitware Robot
Merge-request: !4029
---
Summary of changes:
Help/prop_tgt/IMPORTED_LOCATION.rst| 3 +++
Source/cmFileAPICodemodel.cxx | 2 +-
Source/cmLocalGenerator.cxx| 2 +-
Tests/ExportImport/Import/Interface/pch_iface_test.cpp | 2 +-
4 files changed, 6 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, release, updated. v3.16.0-rc3-79-gf90c351e60
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 f90c351e601a98ddb10822d6973dd2fcc140e13e (commit) via ffa9965700cfebce4ea80b5b1a191a5d19c85a29 (commit) via 7a08f0d8dd7c4337c397b1227c2d3792c2a21215 (commit) via 2944bf46d53b1581b436c675650987bb3d42b3f2 (commit) via 77a8f9ecbcf6458eb07e91a12035a34532d53c7c (commit) via 48d1456b3d2f180acb3afba26a480f3b72fd3ddd (commit) via ec2f130aa9bf97860789c524c0b9902856e4bf18 (commit) from cba091d3a900d69961ef94a475c3ba1b0cb94453 (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/prop_tgt/IMPORTED_LOCATION.rst| 3 +++ Source/cmFileAPICodemodel.cxx | 2 +- Source/cmLocalGenerator.cxx| 2 +- Tests/ExportImport/Import/Interface/pch_iface_test.cpp | 2 +- 4 files changed, 6 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-rc3-352-gc96ba58a5b
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 c96ba58a5bfee1b98cfcef188b716aca72e406df (commit)
via 9a935adca9f969931cedd1b5a3fdfef5bfcbc9d4 (commit)
via cba091d3a900d69961ef94a475c3ba1b0cb94453 (commit)
via e01935ac9d61e22be49f26910a76769585d7a257 (commit)
from bec38523de60cd7602b0fa89d38356c6f5e7cddd (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=c96ba58a5bfee1b98cfcef188b716aca72e406df
commit c96ba58a5bfee1b98cfcef188b716aca72e406df
Merge: 9a935adca9 cba091d3a9
Author: Craig Scott
AuthorDate: Tue Nov 12 13:28:34 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 08:28:47 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a935adca9f969931cedd1b5a3fdfef5bfcbc9d4
commit 9a935adca9f969931cedd1b5a3fdfef5bfcbc9d4
Merge: bec38523de e01935ac9d
Author: Craig Scott
AuthorDate: Tue Nov 12 13:28:34 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 08:28:46 2019 -0500
Merge topic 'pch-no-duplicates'
e01935ac9d PCH: No repeated path for internal generated PCH files
Acked-by: Kitware Robot
Merge-request: !4030
---
Summary of changes:
Source/cmGeneratorTarget.cxx | 10 ++
Source/cmLocalGenerator.cxx| 8
Tests/RunCMake/PrecompileHeaders/DisabledPch-check.cmake | 9 ++---
Tests/RunCMake/PrecompileHeaders/PchInterface-check.cmake | 9 ++---
Tests/RunCMake/PrecompileHeaders/PchMultilanguage-check.cmake | 9 ++---
.../RunCMake/PrecompileHeaders/PchPrologueEpilogue-check.cmake | 6 +-
6 files changed, 17 insertions(+), 34 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-72-gcba091d3a9
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 cba091d3a900d69961ef94a475c3ba1b0cb94453 (commit) via e01935ac9d61e22be49f26910a76769585d7a257 (commit) from 00f5e0206037ceec2d3c33569d1c845fdffa504f (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/cmGeneratorTarget.cxx | 10 ++ Source/cmLocalGenerator.cxx| 8 Tests/RunCMake/PrecompileHeaders/DisabledPch-check.cmake | 9 ++--- Tests/RunCMake/PrecompileHeaders/PchInterface-check.cmake | 9 ++--- Tests/RunCMake/PrecompileHeaders/PchMultilanguage-check.cmake | 9 ++--- .../RunCMake/PrecompileHeaders/PchPrologueEpilogue-check.cmake | 6 +- 6 files changed, 17 insertions(+), 34 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-70-g00f5e02060
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 00f5e0206037ceec2d3c33569d1c845fdffa504f (commit)
via 1d1fa5d3e4f3594f1c1db258e526c4b747117aa2 (commit)
via 108207cc849b3c6f3de57c5ba8676465510d0849 (commit)
from 5e328c6d74ed6b6470e1df1005d07fe930185b52 (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/cpack.1.rst| 2 ++
Help/release/3.16.rst | 5 ++---
Modules/CPack.cmake| 7 ---
Source/CPack/cmCPackGenerator.cxx | 8
Tests/RunCMake/CPack/RunCMakeTest.cmake| 3 ---
.../ExpectedFiles.cmake| 3 ---
.../ZIP-stdout.txt | 3 ---
.../CPACK_INSTALL_CMAKE_CONFIGURATIONS/test.cmake | 9 -
.../{Android => CPackCommandLine}/CMakeLists.txt | 2 +-
.../CPackCommandLine/MultiConfig-check-stdout.txt | 4
.../MultiConfig-package-stdout.txt | 8
Tests/RunCMake/CPackCommandLine/MultiConfig.cmake | 9 +
Tests/RunCMake/CPackCommandLine/RunCMakeTest.cmake | 23 ++
.../CPackCommandLine}/foo.c| 0
14 files changed, 49 insertions(+), 37 deletions(-)
delete mode 100644
Tests/RunCMake/CPack/tests/CPACK_INSTALL_CMAKE_CONFIGURATIONS/ExpectedFiles.cmake
delete mode 100644
Tests/RunCMake/CPack/tests/CPACK_INSTALL_CMAKE_CONFIGURATIONS/ZIP-stdout.txt
delete mode 100644
Tests/RunCMake/CPack/tests/CPACK_INSTALL_CMAKE_CONFIGURATIONS/test.cmake
copy Tests/RunCMake/{Android => CPackCommandLine}/CMakeLists.txt (63%)
create mode 100644 Tests/RunCMake/CPackCommandLine/MultiConfig-check-stdout.txt
create mode 100644
Tests/RunCMake/CPackCommandLine/MultiConfig-package-stdout.txt
create mode 100644 Tests/RunCMake/CPackCommandLine/MultiConfig.cmake
copy Tests/{Architecture => RunCMake/CPackCommandLine}/foo.c (100%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-348-gbec38523de
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via bec38523de60cd7602b0fa89d38356c6f5e7cddd (commit)
via 27020c81d516707ee2069d343cd058496fa71587 (commit)
via 00f5e0206037ceec2d3c33569d1c845fdffa504f (commit)
via 1d1fa5d3e4f3594f1c1db258e526c4b747117aa2 (commit)
via 108207cc849b3c6f3de57c5ba8676465510d0849 (commit)
from 2dcd7ce4ba803fa4c4d27526e45e2c9cbb88e49e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bec38523de60cd7602b0fa89d38356c6f5e7cddd
commit bec38523de60cd7602b0fa89d38356c6f5e7cddd
Merge: 27020c81d5 00f5e02060
Author: Craig Scott
AuthorDate: Tue Nov 12 13:16:17 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 08:16:32 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27020c81d516707ee2069d343cd058496fa71587
commit 27020c81d516707ee2069d343cd058496fa71587
Merge: 2dcd7ce4ba 1d1fa5d3e4
Author: Craig Scott
AuthorDate: Tue Nov 12 13:16:17 2019 +
Commit: Kitware Robot
CommitDate: Tue Nov 12 08:16:31 2019 -0500
Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS'
1d1fa5d3e4 Tests: Add RunCMake.CPackCommandLine case for multi-config
package
108207cc84 CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS
Acked-by: Kitware Robot
Merge-request: !4025
---
Summary of changes:
Help/manual/cpack.1.rst| 2 ++
Help/release/3.16.rst | 5 ++---
Modules/CPack.cmake| 7 ---
Source/CPack/cmCPackGenerator.cxx | 8
Tests/RunCMake/CPack/RunCMakeTest.cmake| 3 ---
.../ExpectedFiles.cmake| 3 ---
.../ZIP-stdout.txt | 3 ---
.../CPACK_INSTALL_CMAKE_CONFIGURATIONS/test.cmake | 9 -
.../CMakeLists.txt | 1 -
.../CPackCommandLine/MultiConfig-check-stdout.txt | 4
.../MultiConfig-package-stdout.txt | 8
Tests/RunCMake/CPackCommandLine/MultiConfig.cmake | 9 +
Tests/RunCMake/CPackCommandLine/RunCMakeTest.cmake | 23 ++
.../CPackCommandLine}/foo.c| 0
14 files changed, 48 insertions(+), 37 deletions(-)
delete mode 100644
Tests/RunCMake/CPack/tests/CPACK_INSTALL_CMAKE_CONFIGURATIONS/ExpectedFiles.cmake
delete mode 100644
Tests/RunCMake/CPack/tests/CPACK_INSTALL_CMAKE_CONFIGURATIONS/ZIP-stdout.txt
delete mode 100644
Tests/RunCMake/CPack/tests/CPACK_INSTALL_CMAKE_CONFIGURATIONS/test.cmake
copy Tests/RunCMake/{INSTALL_NAME_DIR => CPackCommandLine}/CMakeLists.txt (63%)
create mode 100644 Tests/RunCMake/CPackCommandLine/MultiConfig-check-stdout.txt
create mode 100644
Tests/RunCMake/CPackCommandLine/MultiConfig-package-stdout.txt
create mode 100644 Tests/RunCMake/CPackCommandLine/MultiConfig.cmake
copy Tests/{Architecture => RunCMake/CPackCommandLine}/foo.c (100%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-343-g2dcd7ce4ba
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 2dcd7ce4ba803fa4c4d27526e45e2c9cbb88e49e (commit) from 9d95aa04658a5d656f90f031e9fdea661a02 (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=2dcd7ce4ba803fa4c4d27526e45e2c9cbb88e49e commit 2dcd7ce4ba803fa4c4d27526e45e2c9cbb88e49e Author: Kitware Robot AuthorDate: Tue Nov 12 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Tue Nov 12 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8796e7900a..41bde355a6 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 2019) +set(CMake_VERSION_PATCH 20191112) #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-67-g5e328c6d74
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 5e328c6d74ed6b6470e1df1005d07fe930185b52 (commit)
via 8bfd4447eb150b17062e26a739b6b7975118057d (commit)
via 7447aa4b340420b0d55bc17bdd9ca1422b1806cf (commit)
via db91c5f776751173ac4caf9afbcef7700dc055ea (commit)
from adf863f15e348789e4d20e3d2dd792f35d4f4725 (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/Platform/Darwin.cmake | 76 +++-
Source/cmCoreTryCompile.cxx| 208 +
Tests/RunCMake/CMakeLists.txt | 2 +
.../ObjCStandard-result.txt} | 0
...Standard-stderr.txt => ObjCStandard-stderr.txt} | 6 +-
.../{CStandard.cmake => ObjCStandard.cmake}| 6 +-
.../ObjCxxStandard-result.txt} | 0
.../RunCMake/try_compile/ObjCxxStandard-stderr.txt | 7 +
.../{CStandard.cmake => ObjCxxStandard.cmake} | 6 +-
Tests/RunCMake/try_compile/RunCMakeTest.cmake | 6 +
.../RunCMake/try_compile/src.m | 0
.../RunCMake/try_compile/src.mm| 0
Tests/TryCompile/CMakeLists.txt| 19 ++
Tests/TryCompile/{fail.c => fail.m}| 0
.../DummyCXXFile.cxx => Tests/TryCompile/pass.m| 0
15 files changed, 197 insertions(+), 139 deletions(-)
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt =>
try_compile/ObjCStandard-result.txt} (100%)
copy Tests/RunCMake/try_compile/{CudaStandard-stderr.txt =>
ObjCStandard-stderr.txt} (53%)
copy Tests/RunCMake/try_compile/{CStandard.cmake => ObjCStandard.cmake} (57%)
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt =>
try_compile/ObjCxxStandard-result.txt} (100%)
create mode 100644 Tests/RunCMake/try_compile/ObjCxxStandard-stderr.txt
copy Tests/RunCMake/try_compile/{CStandard.cmake => ObjCxxStandard.cmake} (55%)
copy Modules/DummyCXXFile.cxx => Tests/RunCMake/try_compile/src.m (100%)
copy Modules/DummyCXXFile.cxx => Tests/RunCMake/try_compile/src.mm (100%)
copy Tests/TryCompile/{fail.c => fail.m} (100%)
copy Modules/DummyCXXFile.cxx => Tests/TryCompile/pass.m (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-342-g95555d95aa
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 9d95aa04658a5d656f90f031e9fdea661a02 (commit)
via ac7f41d20e676c46989e9768e188ec3161ed5b2a (commit)
via 5e328c6d74ed6b6470e1df1005d07fe930185b52 (commit)
via 19aadc03efe7032533cbf868abfdb10751f67c15 (commit)
via 8bfd4447eb150b17062e26a739b6b7975118057d (commit)
via b75882c2f7b683502a6d2240c885463599e98d35 (commit)
via 7447aa4b340420b0d55bc17bdd9ca1422b1806cf (commit)
via db91c5f776751173ac4caf9afbcef7700dc055ea (commit)
from e3aeae7ee80bfba17568a529f756eb23ef8269a1 (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=9d95aa04658a5d656f90f031e9fdea661a02
commit 9d95aa04658a5d656f90f031e9fdea661a02
Merge: ac7f41d20e 5e328c6d74
Author: Brad King
AuthorDate: Mon Nov 11 15:25:38 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 11 10:25:47 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac7f41d20e676c46989e9768e188ec3161ed5b2a
commit ac7f41d20e676c46989e9768e188ec3161ed5b2a
Merge: 19aadc03ef 7447aa4b34
Author: Brad King
AuthorDate: Mon Nov 11 15:25:38 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 11 10:25:47 2019 -0500
Merge topic 'objc-trycompile'
7447aa4b34 ObjC: Add try_compile support
Acked-by: Kitware Robot
Merge-request: !4006
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19aadc03efe7032533cbf868abfdb10751f67c15
commit 19aadc03efe7032533cbf868abfdb10751f67c15
Merge: b75882c2f7 8bfd4447eb
Author: Brad King
AuthorDate: Mon Nov 11 15:23:50 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 11 10:24:02 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b75882c2f7b683502a6d2240c885463599e98d35
commit b75882c2f7b683502a6d2240c885463599e98d35
Merge: e3aeae7ee8 db91c5f776
Author: Brad King
AuthorDate: Mon Nov 11 15:23:50 2019 +
Commit: Kitware Robot
CommitDate: Mon Nov 11 10:24:02 2019 -0500
Merge topic 'objc-link-main'
db91c5f776 ObjC: Set same settings for all languages supported on Darwin
Acked-by: Kitware Robot
Merge-request: !4012
---
Summary of changes:
Modules/Platform/Darwin.cmake | 76 +++-
Source/cmCoreTryCompile.cxx| 208 +
Tests/RunCMake/CMakeLists.txt | 2 +
.../ObjCStandard-result.txt} | 0
...Standard-stderr.txt => ObjCStandard-stderr.txt} | 6 +-
.../{CStandard.cmake => ObjCStandard.cmake}| 6 +-
.../ObjCxxStandard-result.txt} | 0
.../RunCMake/try_compile/ObjCxxStandard-stderr.txt | 7 +
.../{CStandard.cmake => ObjCxxStandard.cmake} | 6 +-
Tests/RunCMake/try_compile/RunCMakeTest.cmake | 6 +
.../RunCMake/try_compile/src.m | 0
.../RunCMake/try_compile/src.mm| 0
Tests/TryCompile/CMakeLists.txt| 19 ++
Tests/TryCompile/{fail.c => fail.m}| 0
.../DummyCXXFile.cxx => Tests/TryCompile/pass.m| 0
15 files changed, 197 insertions(+), 139 deletions(-)
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt =>
try_compile/ObjCStandard-result.txt} (100%)
copy Tests/RunCMake/try_compile/{CudaStandard-stderr.txt =>
ObjCStandard-stderr.txt} (53%)
copy Tests/RunCMake/try_compile/{CStandard.cmake => ObjCStandard.cmake} (57%)
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt =>
try_compile/ObjCxxStandard-result.txt} (100%)
create mode 100644 Tests/RunCMake/try_compile/ObjCxxStandard-stderr.txt
copy Tests/RunCMake/try_compile/{CStandard.cmake => ObjCxxStandard.cmake} (55%)
copy Modules/DummyCXXFile.cxx => Tests/RunCMake/try_compile/src.m (100%)
copy Modules/DummyCXXFile.cxx => Tests/RunCMake/try_compile/src.mm (100%)
copy Tests/TryCompile/{fail.c => fail.m} (100%)
copy Modules/DummyCXXFile.cxx => Tests/TryCompile/pass.m (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-334-ge3aeae7ee8
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 e3aeae7ee80bfba17568a529f756eb23ef8269a1 (commit) via 75a5d1d4b17634e8ff3df6cdd3fce083aa23495c (commit) via 12fd957ce3dc1d66a9161594679558fd8a73c284 (commit) from eb306700d536849c4125d4a9b84e0bd40b4f2844 (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=e3aeae7ee80bfba17568a529f756eb23ef8269a1 commit e3aeae7ee80bfba17568a529f756eb23ef8269a1 Merge: eb306700d5 75a5d1d4b1 Author: Craig Scott AuthorDate: Mon Nov 11 12:28:13 2019 + Commit: Kitware Robot CommitDate: Mon Nov 11 07:28:24 2019 -0500 Merge topic 'doc-backport' 75a5d1d4b1 Help/dev: Document "Backport:" footer for MR descriptions 12fd957ce3 Help/dev: Add 'external-discussion' to the main workflow status list Acked-by: Kitware Robot Merge-request: !4004 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75a5d1d4b17634e8ff3df6cdd3fce083aa23495c commit 75a5d1d4b17634e8ff3df6cdd3fce083aa23495c Author: Brad King AuthorDate: Wed Nov 6 12:02:05 2019 -0500 Commit: Craig Scott CommitDate: Mon Nov 11 23:24:29 2019 +1100 Help/dev: Document "Backport:" footer for MR descriptions diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst index 44e2273477..a1c1a6fada 100644 --- a/Help/dev/maint.rst +++ b/Help/dev/maint.rst @@ -14,6 +14,11 @@ Review a Merge Request The `CMake Review Process`_ requires a maintainer to issue the ``Do: merge`` command to integrate a merge request. Please check at least the following: +* If the MR source branch (or part of it) should be backported + to the ``release`` branch (and is already based on a commit + contained in the ``release`` branch), add a ``Backport: release`` or + ``Backport: release:`` trailing line to the MR description. + * If the MR source branch is not named well for the change it makes (e.g. it is just ``master`` or the patch changed during review), add a ``Topic-rename: `` trailing line to the MR description @@ -38,9 +43,10 @@ command to integrate a merge request. Please check at least the following: of various nightly builders.) * Ensure that the MR targets the ``master`` branch. A MR intended for - the ``release`` branch should be based on ``release`` but still merged - to ``master`` first (via ``Do: merge``). A maintainer may then merge - the MR topic to ``release`` manually. + the ``release`` branch should be based on ``release`` but still target + ``master``. Use the above-mentioned ``Backport: release`` line to tell + ``Do: merge`` to merge to both. If a MR is merged without the backport + line, a maintainer may still merge the MR topic to ``release`` manually. Maintain Current Release @@ -51,6 +57,12 @@ using a local branch named ``release-$ver``, where ``$ver`` is the version number of the current release in the form ``$major.$minor``. It is always merged into ``master`` before publishing. +To merge an open MR to the ``release`` branch, edit its description to +use the ``Backport: release`` line mentioned above and then ``Do: merge`` +normally. To update the ``release`` branch manually (e.g. to merge a +``$topic`` branch that was merged without the backport line), use the +following procedure. + Before merging a ``$topic`` branch into ``release``, verify that the ``$topic`` branch has already been merged to ``master`` via the usual ``Do: merge`` process. Then, to merge the ``$topic`` branch into diff --git a/Help/dev/review.rst b/Help/dev/review.rst index 36b9789ea0..8ec41d29c6 100644 --- a/Help/dev/review.rst +++ b/Help/dev/review.rst @@ -433,6 +433,21 @@ Additionally, ``Do: merge`` extracts configuration from trailing lines in the MR description (the following have no effect if used in a MR comment instead): +* ``Backport: release[:]``: merge the topic branch into + the ``release`` branch to backport the change. This is allowed + only if the topic branch is based on a commit in ``release`` already. + If only part of the topic branch should be backported, specify it as + ``:``. The may use `git rev-parse`_ + syntax to reference commits relative to the topic ``HEAD``. + See additional `backport instructions`_ for details. + For example: + + ``Backport: release`` +Merge the topic branch head into both ``release`` and ``master``. + ``Backport: release:HEAD~1^2`` +Merge the topic branch head's parent's second parent commit into +the ``release`` branch. Merge the topic branch head to ``master``. + * ``Topic-rename
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-331-geb306700d5
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 eb306700d536849c4125d4a9b84e0bd40b4f2844 (commit) from 77241aafb9e9f3b12f24a5c19883966614e3b457 (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=eb306700d536849c4125d4a9b84e0bd40b4f2844 commit eb306700d536849c4125d4a9b84e0bd40b4f2844 Author: Kitware Robot AuthorDate: Mon Nov 11 00:01:08 2019 -0500 Commit: Kitware Robot CommitDate: Mon Nov 11 00:01:08 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1fc03671a4..8796e7900a 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 20191110) +set(CMake_VERSION_PATCH 2019) #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-63-gadf863f15e
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 adf863f15e348789e4d20e3d2dd792f35d4f4725 (commit) via fcacd8ce8d8843922bd2779f1774425433dfd9cc (commit) from 929d7a454c8069bae4dece36838ed0db6b65d9cf (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/prop_sf/SKIP_UNITY_BUILD_INCLUSION.rst | 10 ++- Help/prop_tgt/UNITY_BUILD.rst | 100 +++--- Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst | 26 -- Help/prop_tgt/UNITY_BUILD_CODE_AFTER_INCLUDE.rst | 17 +++- Help/prop_tgt/UNITY_BUILD_CODE_BEFORE_INCLUDE.rst | 17 +++- Help/variable/CMAKE_UNITY_BUILD.rst | 18 ++-- Help/variable/CMAKE_UNITY_BUILD_BATCH_SIZE.rst| 7 +- 7 files changed, 120 insertions(+), 75 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-330-g77241aafb9
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 77241aafb9e9f3b12f24a5c19883966614e3b457 (commit)
via b613eecfa04400779835e62089410c31a070d2de (commit)
via adf863f15e348789e4d20e3d2dd792f35d4f4725 (commit)
via fcacd8ce8d8843922bd2779f1774425433dfd9cc (commit)
from a9c09599002baa27bdf4f98664829a92ba529240 (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=77241aafb9e9f3b12f24a5c19883966614e3b457
commit 77241aafb9e9f3b12f24a5c19883966614e3b457
Merge: b613eecfa0 adf863f15e
Author: Craig Scott
AuthorDate: Sun Nov 10 20:55:29 2019 +
Commit: Kitware Robot
CommitDate: Sun Nov 10 15:55:43 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b613eecfa04400779835e62089410c31a070d2de
commit b613eecfa04400779835e62089410c31a070d2de
Merge: a9c0959900 fcacd8ce8d
Author: Craig Scott
AuthorDate: Sun Nov 10 20:55:29 2019 +
Commit: Kitware Robot
CommitDate: Sun Nov 10 15:55:43 2019 -0500
Merge topic 'docs-UNITY_BUILD'
fcacd8ce8d Help: Improve readability and fix inaccuracies in unity build
docs
Acked-by: Kitware Robot
Merge-request: !4019
---
Summary of changes:
Help/prop_sf/SKIP_UNITY_BUILD_INCLUSION.rst | 10 ++-
Help/prop_tgt/UNITY_BUILD.rst | 100 +++---
Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst | 26 --
Help/prop_tgt/UNITY_BUILD_CODE_AFTER_INCLUDE.rst | 17 +++-
Help/prop_tgt/UNITY_BUILD_CODE_BEFORE_INCLUDE.rst | 17 +++-
Help/variable/CMAKE_UNITY_BUILD.rst | 18 ++--
Help/variable/CMAKE_UNITY_BUILD_BATCH_SIZE.rst| 7 +-
7 files changed, 120 insertions(+), 75 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-326-ga9c0959900
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 a9c09599002baa27bdf4f98664829a92ba529240 (commit) from 4523e4b3262e81ed179321c154770b20899041c6 (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=a9c09599002baa27bdf4f98664829a92ba529240 commit a9c09599002baa27bdf4f98664829a92ba529240 Author: Kitware Robot AuthorDate: Sun Nov 10 00:01:05 2019 -0500 Commit: Kitware Robot CommitDate: Sun Nov 10 00:01:05 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1374274779..1fc03671a4 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 20191109) +set(CMake_VERSION_PATCH 20191110) #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-325-g4523e4b326
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 4523e4b3262e81ed179321c154770b20899041c6 (commit) from c9d5f80d775d33b7334af6421b77cc45cfab5b27 (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=4523e4b3262e81ed179321c154770b20899041c6 commit 4523e4b3262e81ed179321c154770b20899041c6 Author: Kitware Robot AuthorDate: Sat Nov 9 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Sat Nov 9 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 53a560b84a..1374274779 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 20191108) +set(CMake_VERSION_PATCH 20191109) #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-61-g929d7a454c
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 929d7a454c8069bae4dece36838ed0db6b65d9cf (commit) via a7d9c5e78be43eb21cd24bb5871d279e87653889 (commit) from 11e425be9b205a0a1427b0c60df4f4b1c9ffced0 (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/CTestCoverageCollectGCOV.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-324-gc9d5f80d77
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 c9d5f80d775d33b7334af6421b77cc45cfab5b27 (commit)
via 86610c65c28dc95875aea5978430c314637f1697 (commit)
via 929d7a454c8069bae4dece36838ed0db6b65d9cf (commit)
via a7d9c5e78be43eb21cd24bb5871d279e87653889 (commit)
from a605a09d6e4b851b09f4126cbf02d9700a07472f (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=c9d5f80d775d33b7334af6421b77cc45cfab5b27
commit c9d5f80d775d33b7334af6421b77cc45cfab5b27
Merge: 86610c65c2 929d7a454c
Author: Brad King
AuthorDate: Fri Nov 8 19:04:08 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 8 14:04:17 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86610c65c28dc95875aea5978430c314637f1697
commit 86610c65c28dc95875aea5978430c314637f1697
Merge: a605a09d6e a7d9c5e78b
Author: Brad King
AuthorDate: Fri Nov 8 19:04:08 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 8 14:04:17 2019 -0500
Merge topic 'CTestCoverageCollectGCOV-typo'
a7d9c5e78b CTestCoverageCollectGCOV: Fix typo in
ctest_coverage_collect_gcov docs
Acked-by: Kitware Robot
Merge-request: !4016
---
Summary of changes:
Modules/CTestCoverageCollectGCOV.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-320-ga605a09d6e
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 a605a09d6e4b851b09f4126cbf02d9700a07472f (commit)
via c67913846969318fa842a2f42810e9366e2b8188 (commit)
via 11e425be9b205a0a1427b0c60df4f4b1c9ffced0 (commit)
via f35df783b5c26b5ad1e54719ef1dac062c532bd7 (commit)
from d8062b575b4a6246edeac264f6dce8fd3d64e3d6 (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=a605a09d6e4b851b09f4126cbf02d9700a07472f
commit a605a09d6e4b851b09f4126cbf02d9700a07472f
Merge: c679138469 11e425be9b
Author: Brad King
AuthorDate: Fri Nov 8 15:36:21 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 8 10:36:30 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c67913846969318fa842a2f42810e9366e2b8188
commit c67913846969318fa842a2f42810e9366e2b8188
Merge: d8062b575b f35df783b5
Author: Brad King
AuthorDate: Fri Nov 8 15:36:21 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 8 10:36:30 2019 -0500
Merge topic 'doc-pch-genex'
f35df783b5 Help: Document target_precompile_headers genex with angle
brackets
Acked-by: Kitware Robot
Merge-request: !4015
---
Summary of changes:
Help/command/target_precompile_headers.rst | 11 +++
1 file changed, 11 insertions(+)
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-59-g11e425be9b
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 11e425be9b205a0a1427b0c60df4f4b1c9ffced0 (commit) via f35df783b5c26b5ad1e54719ef1dac062c532bd7 (commit) from 0f1458022d9e94118a656fa87df0c2daac29a458 (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 | 11 +++ 1 file changed, 11 insertions(+) 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-316-gd8062b575b
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 d8062b575b4a6246edeac264f6dce8fd3d64e3d6 (commit)
via 24d52daf49e8da92bf21eeb9f3687c84993ba2b6 (commit)
from b115e96fff2933fd29a4c065222920d192395deb (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=d8062b575b4a6246edeac264f6dce8fd3d64e3d6
commit d8062b575b4a6246edeac264f6dce8fd3d64e3d6
Merge: b115e96fff 24d52daf49
Author: Brad King
AuthorDate: Fri Nov 8 14:50:06 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 8 09:50:15 2019 -0500
Merge topic 'openssl-pkg-config-directories'
24d52daf49 FindOpenSSL: Lookup all pkg-config directories
Acked-by: Kitware Robot
Merge-request: !4010
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24d52daf49e8da92bf21eeb9f3687c84993ba2b6
commit 24d52daf49e8da92bf21eeb9f3687c84993ba2b6
Author: Denis Thulin
AuthorDate: Thu Nov 7 15:39:52 2019 +0100
Commit: Denis Thulin
CommitDate: Thu Nov 7 16:44:12 2019 +0100
FindOpenSSL: Lookup all pkg-config directories
When using a custom sysroot to build things using pkg-config, some of
the output variables feature the sysroot while others do not:
```console
$ export PKG_CONFIG_SYSROOT_DIR=/path/to/sysroot
$ export PKG_CONFIG_LIBDIR=/path/to/sysroot/usr/lib/pkgconfig
$ pkg-config --cflags-only-I openssl
-I/path/to/sysroot/usr/include/
$ pkg-config --variable=includedir openssl
/usr/include
$ pkg-config --libs-only-L openssl
-L/path/to/sysroot/usr/lib
$ pkg-config --variable=libdir openssl
/usr/lib
```
When using `pkg_check_modules`, it's pretty much the same:
```cmake
pkg_check_modules(_OPENSSL QUIET openssl)
_OPENSSL_INCLUDE_DIRS == /path/to/sysroot/usr/include/
_OPENSSL_INCLUDEDIR == /usr/include
_OPENSSL_LIBRARY_DIRS == -L/path/to/sysroot/usr/lib
_OPENSSL_LIBDIR == /usr/lib
```
However, FindOpenSSL only searches for headers in `INCLUDEDIR` and
libraries in `LIBDIR` instead of searching `INCLUDE_DIRS` and
`LIBRARY_DIRS` as well.
This fixes that behaviour.
Fixes: #16885
Signed-off-by: Denis Thulin
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 33ceab7541..3688ae9dba 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -131,6 +131,7 @@ find_path(OPENSSL_INCLUDE_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS}
HINTS
${_OPENSSL_INCLUDEDIR}
+${_OPENSSL_INCLUDE_DIRS}
PATH_SUFFIXES
include
)
@@ -319,6 +320,7 @@ else()
${_OPENSSL_ROOT_HINTS_AND_PATHS}
HINTS
${_OPENSSL_LIBDIR}
+ ${_OPENSSL_LIBRARY_DIRS}
PATH_SUFFIXES
lib
)
@@ -330,6 +332,7 @@ else()
${_OPENSSL_ROOT_HINTS_AND_PATHS}
HINTS
${_OPENSSL_LIBDIR}
+ ${_OPENSSL_LIBRARY_DIRS}
PATH_SUFFIXES
lib
)
---
Summary of changes:
Modules/FindOpenSSL.cmake | 3 +++
1 file changed, 3 insertions(+)
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-314-gb115e96fff
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 b115e96fff2933fd29a4c065222920d192395deb (commit) via 9f7ca15de61d6a4e9f1b30569a55641419bfeac2 (commit) via 0f1458022d9e94118a656fa87df0c2daac29a458 (commit) via b2857514b0c08171a171d0e3ce72571c8074b78e (commit) from db669b4d1a5fc7e3cfa3d76a9d35e11753e806e2 (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=b115e96fff2933fd29a4c065222920d192395deb commit b115e96fff2933fd29a4c065222920d192395deb Merge: 9f7ca15de6 0f1458022d Author: Brad King AuthorDate: Fri Nov 8 14:40:55 2019 + Commit: Kitware Robot CommitDate: Fri Nov 8 09:41:05 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f7ca15de61d6a4e9f1b30569a55641419bfeac2 commit 9f7ca15de61d6a4e9f1b30569a55641419bfeac2 Merge: db669b4d1a b2857514b0 Author: Brad King AuthorDate: Fri Nov 8 14:40:55 2019 + Commit: Kitware Robot CommitDate: Fri Nov 8 09:41:05 2019 -0500 Merge topic 'revert-FindBinUtils-ask-compiler' b2857514b0 FindBinUtils: Revert "Use the compiler to get the path to compiler tools" Acked-by: Kitware Robot Merge-request: !4009 --- Summary of changes: Modules/CMakeFindBinUtils.cmake | 70 ++--- Modules/Compiler/GNU-FindBinUtils.cmake | 26 +--- 2 files changed, 21 insertions(+), 75 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-57-g0f1458022d
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 0f1458022d9e94118a656fa87df0c2daac29a458 (commit) via b2857514b0c08171a171d0e3ce72571c8074b78e (commit) from 87dcbe0b2122ee9cfea81369a45d15b22853ba90 (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 | 70 ++--- Modules/Compiler/GNU-FindBinUtils.cmake | 26 +--- 2 files changed, 21 insertions(+), 75 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-310-gdb669b4d1a
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 db669b4d1a5fc7e3cfa3d76a9d35e11753e806e2 (commit) from 449fceeb1fd9619d9b01f8aed0e9e5784e10dacb (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=db669b4d1a5fc7e3cfa3d76a9d35e11753e806e2 commit db669b4d1a5fc7e3cfa3d76a9d35e11753e806e2 Author: Kitware Robot AuthorDate: Fri Nov 8 00:01:09 2019 -0500 Commit: Kitware Robot CommitDate: Fri Nov 8 00:01:09 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index bb56009e81..53a560b84a 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 20191107) +set(CMake_VERSION_PATCH 20191108) #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-309-g449fceeb1f
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 449fceeb1fd9619d9b01f8aed0e9e5784e10dacb (commit)
via bea26f5aa0e1b98dea9d87ba2444c0901842f97c (commit)
via 87dcbe0b2122ee9cfea81369a45d15b22853ba90 (commit)
via 016601e5e6f152403306c12997534aadd4287d38 (commit)
via c1435d98120dff203de01d75f8f91e99bc75fe2b (commit)
via eb9d945f142ac7638baaf879fb9464fa39e3e9a7 (commit)
via c544cb66984f16cc63ebace16ccd911adc550b9d (commit)
via 6ce27d3a2efad4e40d4354a7d17e4259fb4c1e24 (commit)
via a7c1e15cc46aa97cc19c9eb84fe8cad55c650bfa (commit)
via 73a40b19ffa49bfc92fbe10bd0fd3821b7facae6 (commit)
via af9ed543b0f9d032158f91cdce7ad6908ff9365b (commit)
from 74569996e8fe798386cca2d4241acea0644f6275 (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=449fceeb1fd9619d9b01f8aed0e9e5784e10dacb
commit 449fceeb1fd9619d9b01f8aed0e9e5784e10dacb
Merge: bea26f5aa0 87dcbe0b21
Author: Kyle Edwards
AuthorDate: Thu Nov 7 18:10:46 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 13:10:57 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bea26f5aa0e1b98dea9d87ba2444c0901842f97c
commit bea26f5aa0e1b98dea9d87ba2444c0901842f97c
Merge: 74569996e8 016601e5e6
Author: Kyle Edwards
AuthorDate: Thu Nov 7 18:10:46 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 13:10:57 2019 -0500
Merge topic 'ctest-resource-groups'
016601e5e6 Merge branch 'backport-ctest-resource-groups'
c1435d9812 Help: Fix error in resource allocation example
eb9d945f14 CTest: Rename hardware -> resources for RunCMake tests
c544cb6698 CTest: Rename hardware -> resources for source code
6ce27d3a2e cmCTestMultiProcessHandler: Rename resource locking functions
a7c1e15cc4 CTest: Rename hardware -> resources for CMake variables, command
options
73a40b19ff CTest: Rename "Processes" lexer to "ResourceGroups"
af9ed543b0 CTest: Rename PROCESSES test property to RESOURCE_GROUPS
Acked-by: Kitware Robot
Merge-request: !3994
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=016601e5e6f152403306c12997534aadd4287d38
commit 016601e5e6f152403306c12997534aadd4287d38
Merge: 370fe1495b c1435d9812
Author: Brad King
AuthorDate: Tue Nov 5 12:59:16 2019 -0500
Commit: Brad King
CommitDate: Tue Nov 5 12:59:16 2019 -0500
Merge branch 'backport-ctest-resource-groups'
diff --cc Source/CTest/cmCTestRunTest.h
index 881cbb6486,f781c7ab0d..d5e83d9e4d
--- a/Source/CTest/cmCTestRunTest.h
+++ b/Source/CTest/cmCTestRunTest.h
@@@ -129,14 -128,13 +132,14 @@@ private
std::string StartTime;
std::string ActualCommand;
std::vector Arguments;
- bool UseAllocatedHardware = false;
+ bool UseAllocatedResources = false;
std::vector>>
- AllocatedHardware;
+ std::string, std::vector>>
+ AllocatedResources;
- bool RunUntilFail;
- int NumberOfRunsLeft;
- bool RunAgain;
+ cmCTest::Rerun RerunMode = cmCTest::Rerun::Never;
+ int NumberOfRunsLeft = 1; // default to 1 run of the test
+ int NumberOfRunsTotal = 1; // default to 1 run of the test
+ bool RunAgain = false; // default to not having to run again
size_t TotalNumberOfTests;
};
diff --cc Source/ctest.cxx
index 2659e3071b,0d65902ef0..a7b11cd944
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@@ -99,14 -99,11 +99,14 @@@ static const char* cmDocumentationOptio
{ "-U, --union", "Take the Union of -I and -R" },
{ "--rerun-failed", "Run only the tests that failed previously" },
{ "--repeat-until-fail ",
-"Require each test to run "
-"times without failing in order to pass" },
+"Require each test to run times without failing in order to pass" },
+ { "--repeat-until-pass ",
+"Allow each test to run up to times in order to pass" },
+ { "--repeat-after-timeout ",
+"Allow each test to run up to times if it times out" },
{ "--max-width ", "Set the max width for a test name to output" },
{ "--interactive-debug-mode [0|1]", "Set the interactive mode to 0 or 1." },
- { "--hardware-spec-file ", "Set the hardware spec file to use." },
+ { "--resource-spec-file ", "Set the resource spec file to use." },
{ "--no-label-summary", "Disable timing s
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-55-g87dcbe0b21
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 87dcbe0b2122ee9cfea81369a45d15b22853ba90 (commit) via c1435d98120dff203de01d75f8f91e99bc75fe2b (commit) via eb9d945f142ac7638baaf879fb9464fa39e3e9a7 (commit) via c544cb66984f16cc63ebace16ccd911adc550b9d (commit) via 6ce27d3a2efad4e40d4354a7d17e4259fb4c1e24 (commit) via a7c1e15cc46aa97cc19c9eb84fe8cad55c650bfa (commit) via 73a40b19ffa49bfc92fbe10bd0fd3821b7facae6 (commit) via af9ed543b0f9d032158f91cdce7ad6908ff9365b (commit) from 02ed66c04bf24d4c13fb6f82d040b835c966bf0c (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/ctest_test.rst| 8 +- Help/manual/cmake-properties.7.rst | 2 +- Help/manual/ctest.1.rst| 143 ++-- Help/prop_test/PROCESSES.rst | 54 - Help/prop_test/RESOURCE_GROUPS.rst | 54 + Help/prop_test/RESOURCE_LOCK.rst | 14 +- Help/release/3.16.rst | 4 +- Source/CMakeLists.txt | 12 +- Source/CTest/cmCTestBinPacker.cxx | 132 +-- Source/CTest/cmCTestBinPacker.h| 10 +- Source/CTest/cmCTestMultiProcessHandler.cxx| 101 + Source/CTest/cmCTestMultiProcessHandler.h | 32 +-- Source/CTest/cmCTestProcessesLexerHelper.cxx | 55 - ...eAllocator.cxx => cmCTestResourceAllocator.cxx} | 20 +- ...dwareAllocator.h => cmCTestResourceAllocator.h} | 10 +- Source/CTest/cmCTestResourceGroupsLexerHelper.cxx | 55 + ...Helper.h => cmCTestResourceGroupsLexerHelper.h} | 12 +- ...estHardwareSpec.cxx => cmCTestResourceSpec.cxx} | 28 +-- ...cmCTestHardwareSpec.h => cmCTestResourceSpec.h} | 10 +- Source/CTest/cmCTestRunTest.cxx| 16 +- Source/CTest/cmCTestRunTest.h | 21 +- Source/CTest/cmCTestTestCommand.cxx| 6 +- Source/CTest/cmCTestTestCommand.h | 2 +- Source/CTest/cmCTestTestHandler.cxx| 28 +-- Source/CTest/cmCTestTestHandler.h | 12 +- Source/LexerParser/.gitattributes | 4 +- ...sesLexer.cxx => cmCTestResourceGroupsLexer.cxx} | 168 +++--- ...ocessesLexer.h => cmCTestResourceGroupsLexer.h} | 252 ++--- ...sLexer.in.l => cmCTestResourceGroupsLexer.in.l} | 38 ++-- Source/cmCTest.cxx | 6 +- Source/ctest.cxx | 2 +- Tests/CMakeLib/CMakeLists.txt | 8 +- Tests/CMakeLib/testCTestBinPacker.cxx | 18 +- ...llocator.cxx => testCTestResourceAllocator.cxx} | 66 +++--- ...stProcesses.cxx => testCTestResourceGroups.cxx} | 11 +- ...tHardwareSpec.cxx => testCTestResourceSpec.cxx} | 16 +- .../spec1.json | 0 .../spec10.json| 0 .../spec11.json| 0 .../spec12.json| 0 .../spec13.json| 0 .../spec14.json| 0 .../spec15.json| 0 .../spec16.json| 0 .../spec17.json| 0 .../spec18.json| 0 .../spec2.json | 0 .../spec3.json | 0 .../spec4.json | 0 .../spec5.json | 0 .../spec6.json | 0 .../spec7.json | 0 .../spec8.json | 0 .../spec9.json | 0 Tests/RunCMake/CMakeLists.txt | 24 +- Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 2 +- .../CTestCommandLine/show-only_json-v1_check.py| 6 +- .../CTestHardwareAllocation/HardwareCommon.cmake | 23 -- .../CTestHardwareAllocation/RunCMakeTest.cmake | 167 -- .../checkfree1-ctest-s-hw-check.cmake | 1 - .../CTestHardwareAllocation/checkfree1.cmake | 7 - .../checkfree2-ctest-s-hw-check.cmake | 1 - .../CTestHardwareAllocation/checkfree2.cmake | 8 - .../cthwalloc-write-proc-good2-check.cm
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-47-g02ed66c04b
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 02ed66c04bf24d4c13fb6f82d040b835c966bf0c (commit) via 0746a3398f4e22f80c19b6253c4df652f9c41214 (commit) via 03e4fe65b0c4666ed46d0f2a7e2cfe00e30f7406 (commit) via 7ddf46230431cd3375f911d4b406af663595861d (commit) via 9a7b4f47aa3cf4ce03aad117d2e1de893c34acb0 (commit) via f0c00bec1d7ce8f1209c4024e6000f907f11f1e9 (commit) from ef86e8991b6b9b2d4b25f98a95ba950f9ba19485 (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/prop_tgt/UNITY_BUILD.rst | 5 ++--- Modules/CMakeOBJCInformation.cmake| 2 +- Modules/CMakeOBJCXXInformation.cmake | 2 +- Source/CMakeLists.txt | 2 +- Source/cmLocalGenerator.cxx | 1 - Tests/RunCMake/UnityBuild/unitybuild_skip-check.cmake | 6 +++--- Tests/RunCMake/UnityBuild/unitybuild_skip.cmake | 5 + 7 files changed, 9 insertions(+), 14 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-298-g74569996e8
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 74569996e8fe798386cca2d4241acea0644f6275 (commit)
via d4611b05a87e125406588921a7cedc4efae8c8cd (commit)
via f7612a66680f0a6ab4bb16ff3f545463bf900ad6 (commit)
via 02ed66c04bf24d4c13fb6f82d040b835c966bf0c (commit)
via e1df51b19f1f9707a946068f5bf563c582e08d4f (commit)
via 15feb5d3f899b1d7f8fb9b92f41cb0f307fa5640 (commit)
via 0746a3398f4e22f80c19b6253c4df652f9c41214 (commit)
via 5531e0447257f7a7c2df8a8434f0ba2e207a9938 (commit)
via c2b3d0872e41b172ebded93b2c98e0ffb3b54e6b (commit)
via 03e4fe65b0c4666ed46d0f2a7e2cfe00e30f7406 (commit)
via 7ddf46230431cd3375f911d4b406af663595861d (commit)
via 9a7b4f47aa3cf4ce03aad117d2e1de893c34acb0 (commit)
via f0c00bec1d7ce8f1209c4024e6000f907f11f1e9 (commit)
via 53227a4ff27c6eda7cb5b3b283f96d1f2d2d56ca (commit)
from e5b0b8560dc40d8d7556a34b7b69409c7c2502fe (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=74569996e8fe798386cca2d4241acea0644f6275
commit 74569996e8fe798386cca2d4241acea0644f6275
Merge: d4611b05a8 53227a4ff2
Author: Brad King
AuthorDate: Thu Nov 7 15:26:39 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 10:27:59 2019 -0500
Merge topic 'refactor-foreach'
53227a4ff2 Refactor: Modernize `foreach` code and fix some bugs
Acked-by: Kitware Robot
Merge-request: !3986
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4611b05a87e125406588921a7cedc4efae8c8cd
commit d4611b05a87e125406588921a7cedc4efae8c8cd
Merge: f7612a6668 02ed66c04b
Author: Brad King
AuthorDate: Thu Nov 7 15:26:25 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 10:26:50 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7612a66680f0a6ab4bb16ff3f545463bf900ad6
commit f7612a66680f0a6ab4bb16ff3f545463bf900ad6
Merge: e1df51b19f 7ddf462304
Author: Brad King
AuthorDate: Thu Nov 7 15:26:25 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 10:26:50 2019 -0500
Merge topic 'unity-include-generated'
7ddf462304 Unity build: Include GENERATED files into unity build
Acked-by: Kitware Robot
Acked-by: Julien Schueller
Merge-request: !4001
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1df51b19f1f9707a946068f5bf563c582e08d4f
commit e1df51b19f1f9707a946068f5bf563c582e08d4f
Merge: 15feb5d3f8 0746a3398f
Author: Brad King
AuthorDate: Thu Nov 7 15:24:35 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 10:25:45 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15feb5d3f899b1d7f8fb9b92f41cb0f307fa5640
commit 15feb5d3f899b1d7f8fb9b92f41cb0f307fa5640
Merge: 5531e04472 f0c00bec1d
Author: Brad King
AuthorDate: Thu Nov 7 15:24:35 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 10:25:45 2019 -0500
Merge topic 'llvm-rc-fix'
f0c00bec1d CMakeVersion.rc: Fix build with llvm-rc
Acked-by: Kitware Robot
Merge-request: !4003
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5531e0447257f7a7c2df8a8434f0ba2e207a9938
commit 5531e0447257f7a7c2df8a8434f0ba2e207a9938
Merge: c2b3d0872e 03e4fe65b0
Author: Brad King
AuthorDate: Thu Nov 7 15:24:23 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 10:24:34 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2b3d0872e41b172ebded93b2c98e0ffb3b54e6b
commit c2b3d0872e41b172ebded93b2c98e0ffb3b54e6b
Merge: e5b0b8560d 9a7b4f47aa
Author: Brad King
AuthorDate: Thu Nov 7 15:24:23 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 10:24:34 2019 -0500
Merge topic 'objc-x-objc'
9a7b4f47aa ObjC: Mark explicitly the language for compilation
Acked-by: Kitware Robot
Merge-request: !4002
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53227a4ff27c6eda7cb5b3b283f96d1f2d2d56ca
commit 53227a4ff27c6eda7cb5b3b283f96d1f2d2d56ca
Author: Alex Turbov
AuthorDate: Mon Nov 4 17:11:07 2019 +0200
Commit: Alex Turbov
CommitDate: Wed Nov 6 16:14:47 2019 +0200
Refactor: Modernize `foreach` code and fix some bugs
- fix the typo in `foreach` documentation
- fix broken `foreach(... IN ITEMS ... LISTS ...)`
- add tests of `foreach` for existed functionality and fixes
diff --git a/Help/command/foreach.rst b/Help/command/foreach.rst
index ae2afb2905..ecbfed3d9d 100644
--- a/Help/comm
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-284-ge5b0b8560d
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 e5b0b8560dc40d8d7556a34b7b69409c7c2502fe (commit)
via 3dfefc1ad7d1341aab0bce838e7b2b7a15f7e7a1 (commit)
via 61ce9d17697db65d179b348845e07f7649818d65 (commit)
via 145b2d571485fd882d76e86a16d554329a5d7bfc (commit)
via 0faeb6a4282f476eb5873b7a1e6d60760a06c3bd (commit)
via f95d5bed52b4200ec025fb2be5012ff833cd8dbc (commit)
via 4011b1be41e97de3f1c1cee741f0627838913974 (commit)
from 9493c770d520d335aeceec81399207f4261f4392 (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=e5b0b8560dc40d8d7556a34b7b69409c7c2502fe
commit e5b0b8560dc40d8d7556a34b7b69409c7c2502fe
Merge: 3dfefc1ad7 61ce9d1769
Author: Brad King
AuthorDate: Thu Nov 7 09:33:08 2019 -0500
Commit: Brad King
CommitDate: Thu Nov 7 09:33:08 2019 -0500
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dfefc1ad7d1341aab0bce838e7b2b7a15f7e7a1
commit 3dfefc1ad7d1341aab0bce838e7b2b7a15f7e7a1
Merge: 145b2d5714 f95d5bed52
Author: Brad King
AuthorDate: Thu Nov 7 09:32:27 2019 -0500
Commit: Brad King
CommitDate: Thu Nov 7 09:32:27 2019 -0500
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61ce9d17697db65d179b348845e07f7649818d65
commit 61ce9d17697db65d179b348845e07f7649818d65
Merge: 4011b1be41 0faeb6a428
Author: Brad King
AuthorDate: Thu Nov 7 09:31:59 2019 -0500
Commit: Brad King
CommitDate: Thu Nov 7 09:31:59 2019 -0500
Merge branch 'backport-FindBoost-meta-component-ALL' into release-3.15
Merge-request: !4008
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=145b2d571485fd882d76e86a16d554329a5d7bfc
commit 145b2d571485fd882d76e86a16d554329a5d7bfc
Merge: 9493c770d5 0faeb6a428
Author: Brad King
AuthorDate: Thu Nov 7 14:31:30 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 09:31:38 2019 -0500
Merge topic 'backport-FindBoost-meta-component-ALL'
0faeb6a428 FindBoost: Prevent warning due to new meta-component "ALL" of
Boost 1.73
Acked-by: Kitware Robot
Merge-request: !4008
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0faeb6a4282f476eb5873b7a1e6d60760a06c3bd
commit 0faeb6a4282f476eb5873b7a1e6d60760a06c3bd
Author: Deniz Bahadir
AuthorDate: Tue Nov 5 17:27:24 2019 +0100
Commit: Brad King
CommitDate: Thu Nov 7 09:29:54 2019 -0500
FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 078000f228..af4947caee 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -449,6 +449,9 @@ if (NOT Boost_NO_BOOST_CMAKE)
# Convert component found variables to standard variables if required
# Necessary for legacy boost-cmake and 1.70 builtin BoostConfig
if(Boost_FIND_COMPONENTS)
+ # Ignore the meta-component "ALL", introduced by Boost 1.73
+ list(REMOVE_ITEM Boost_FIND_COMPONENTS "ALL")
+
foreach(_comp IN LISTS Boost_FIND_COMPONENTS)
if(DEFINED Boost_${_comp}_FOUND)
continue()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f95d5bed52b4200ec025fb2be5012ff833cd8dbc
commit f95d5bed52b4200ec025fb2be5012ff833cd8dbc
Merge: 6d01a8e004 aeae4182cb
Author: Brad King
AuthorDate: Thu Nov 7 09:27:03 2019 -0500
Commit: Brad King
CommitDate: Thu Nov 7 09:29:27 2019 -0500
Merge branch 'backport-findpostgres-10-and-older' into release-3.14
Merge-request: !4007
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4011b1be41e97de3f1c1cee741f0627838913974
commit 4011b1be41e97de3f1c1cee741f0627838913974
Merge: 2a5e5b25ba aeae4182cb
Author: Brad King
AuthorDate: Thu Nov 7 09:28:36 2019 -0500
Commit: Brad King
CommitDate: Thu Nov 7 09:29:20 2019 -0500
Merge branch 'backport-findpostgres-10-and-older' into release-3.15
Merge-request: !4007
---
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-277-g9493c770d5
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 9493c770d520d335aeceec81399207f4261f4392 (commit)
via aeae4182cb90cbf65b1c27cc877f62d2c7690aaf (commit)
from 8f3cbe3c65e1c723319d8c63ef7f3e3c8ef5b59d (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=9493c770d520d335aeceec81399207f4261f4392
commit 9493c770d520d335aeceec81399207f4261f4392
Merge: 8f3cbe3c65 aeae4182cb
Author: Brad King
AuthorDate: Thu Nov 7 14:26:07 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 7 09:26:17 2019 -0500
Merge topic 'findpostgres-10-and-older'
aeae4182cb FindPostgreSQL: support version encoding used in pre-10 releases
Acked-by: Kitware Robot
Merge-request: !4007
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aeae4182cb90cbf65b1c27cc877f62d2c7690aaf
commit aeae4182cb90cbf65b1c27cc877f62d2c7690aaf
Author: Ben Boeckel
AuthorDate: Mon Nov 4 16:37:06 2019 -0500
Commit: Brad King
CommitDate: Thu Nov 7 09:24:12 2019 -0500
FindPostgreSQL: support version encoding used in pre-10 releases
With the 10.x release, PostgreSQL upstream started encoding the version
as `MM` where `M` is major and `m` is minor. Prior to that, `MMmmPP`
was used where `P` was the patch number. Detect this difference and
decode it based on the used encoding.
Fixes: #19912
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 4b5e60e21a..1631c9c332 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -184,11 +184,22 @@ if (PostgreSQL_INCLUDE_DIR)
endif()
endforeach()
if (_PostgreSQL_VERSION_NUM)
-math(EXPR _PostgreSQL_major_version "${_PostgreSQL_VERSION_NUM} / 1")
-math(EXPR _PostgreSQL_minor_version "${_PostgreSQL_VERSION_NUM} % 1")
-set(PostgreSQL_VERSION_STRING
"${_PostgreSQL_major_version}.${_PostgreSQL_minor_version}")
-unset(_PostgreSQL_major_version)
-unset(_PostgreSQL_minor_version)
+# 9.x and older encoding
+if (_PostgreSQL_VERSION_NUM LESS 10)
+ math(EXPR _PostgreSQL_major_version "${_PostgreSQL_VERSION_NUM} / 1")
+ math(EXPR _PostgreSQL_minor_version "${_PostgreSQL_VERSION_NUM} % 1
/ 100")
+ math(EXPR _PostgreSQL_patch_version "${_PostgreSQL_VERSION_NUM} % 100")
+ set(PostgreSQL_VERSION_STRING
"${_PostgreSQL_major_version}.${_PostgreSQL_minor_version}.${_PostgreSQL_patch_version}")
+ unset(_PostgreSQL_major_version)
+ unset(_PostgreSQL_minor_version)
+ unset(_PostgreSQL_patch_version)
+else ()
+ math(EXPR _PostgreSQL_major_version "${_PostgreSQL_VERSION_NUM} / 1")
+ math(EXPR _PostgreSQL_minor_version "${_PostgreSQL_VERSION_NUM} % 1")
+ set(PostgreSQL_VERSION_STRING
"${_PostgreSQL_major_version}.${_PostgreSQL_minor_version}")
+ unset(_PostgreSQL_major_version)
+ unset(_PostgreSQL_minor_version)
+endif ()
else ()
foreach(_PG_CONFIG_HEADER ${_PG_CONFIG_HEADERS})
if(EXISTS "${_PG_CONFIG_HEADER}")
diff --git a/Tests/FindPostgreSQL/Test/main.c b/Tests/FindPostgreSQL/Test/main.c
index 2cfeed0da2..a63377a256 100644
--- a/Tests/FindPostgreSQL/Test/main.c
+++ b/Tests/FindPostgreSQL/Test/main.c
@@ -5,10 +5,19 @@
int main()
{
int version = PQlibVersion();
- int major = version / 1;
- int minor = version % 1;
char version_string[100];
- snprintf(version_string, sizeof(version_string), "%d.%d", major, minor);
+ // 9.x and older encoding.
+ if (version < 10) {
+int major = version / 1;
+int minor = version % 1 / 100;
+int patch = version % 100;
+snprintf(version_string, sizeof(version_string), "%d.%d.%d", major, minor,
+ patch);
+ } else {
+int major = version / 1;
+int minor = version % 1;
+snprintf(version_string, sizeof(version_string), "%d.%d", major, minor);
+ }
printf("Found PostgreSQL version %s, expected version %s\n", version_string,
CMAKE_EXPECTED_POSTGRESQL_VERSION);
return strcmp(version_string, CMAKE_EXPECTED_POSTGRESQL_VERSION);
---
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-275-g8f3cbe3c65
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 8f3cbe3c65e1c723319d8c63ef7f3e3c8ef5b59d (commit) from 954bb6549b8ff4f3429372b0ed780029b50616c4 (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=8f3cbe3c65e1c723319d8c63ef7f3e3c8ef5b59d commit 8f3cbe3c65e1c723319d8c63ef7f3e3c8ef5b59d Author: Kitware Robot AuthorDate: Thu Nov 7 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Thu Nov 7 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c8e91089da..bb56009e81 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 20191106) +set(CMake_VERSION_PATCH 20191107) #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-274-g954bb6549b
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 954bb6549b8ff4f3429372b0ed780029b50616c4 (commit)
via 2a67ebf71b1b6086fcfdde04d77925038f81850c (commit)
from ce7408514c98d39612c7f1e1d85929c223f71068 (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=954bb6549b8ff4f3429372b0ed780029b50616c4
commit 954bb6549b8ff4f3429372b0ed780029b50616c4
Merge: ce7408514c 2a67ebf71b
Author: Kyle Edwards
AuthorDate: Wed Nov 6 21:38:25 2019 +
Commit: Kitware Robot
CommitDate: Wed Nov 6 16:38:34 2019 -0500
Merge topic 'modernize-memory-management'
2a67ebf71b cmGeneratorTarget: modernize memory management
Acked-by: Kitware Robot
Merge-request: !3997
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a67ebf71b1b6086fcfdde04d77925038f81850c
commit 2a67ebf71b1b6086fcfdde04d77925038f81850c
Author: Marc Chevrier
AuthorDate: Tue Nov 5 18:57:46 2019 +0100
Commit: Marc Chevrier
CommitDate: Tue Nov 5 20:10:01 2019 +0100
cmGeneratorTarget: modernize memory management
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 41f1df9a1c..5090d87ada 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -10,11 +10,11 @@
#include
#include
#include
-#include
#include
#include
#include
+#include
#include
#include
@@ -162,7 +162,8 @@ private:
cmListFileBacktrace Backtrace;
};
-cmGeneratorTarget::TargetPropertyEntry* CreateTargetPropertyEntry(
+std::unique_ptr
+CreateTargetPropertyEntry(
const std::string& propertyValue,
cmListFileBacktrace backtrace = cmListFileBacktrace(),
bool evaluateForBuildsystem = false)
@@ -172,15 +173,18 @@ cmGeneratorTarget::TargetPropertyEntry*
CreateTargetPropertyEntry(
std::unique_ptr cge =
ge.Parse(propertyValue);
cge->SetEvaluateForBuildsystem(evaluateForBuildsystem);
-return new TargetPropertyEntryGenex(std::move(cge));
+return std::unique_ptr(
+ cm::make_unique(std::move(cge)));
}
- return new TargetPropertyEntryString(propertyValue, std::move(backtrace));
+ return std::unique_ptr(
+cm::make_unique(propertyValue,
+ std::move(backtrace)));
}
void CreatePropertyGeneratorExpressions(
cmStringRange entries, cmBacktraceRange backtraces,
- std::vector& items,
+ std::vector>& items,
bool evaluateForBuildsystem = false)
{
auto btIt = backtraces.begin();
@@ -219,13 +223,13 @@ struct EvaluatedTargetPropertyEntry
EvaluatedTargetPropertyEntry EvaluateTargetPropertyEntry(
cmGeneratorTarget const* thisTarget, std::string const& config,
std::string const& lang, cmGeneratorExpressionDAGChecker* dagChecker,
- cmGeneratorTarget::TargetPropertyEntry* entry)
+ cmGeneratorTarget::TargetPropertyEntry& entry)
{
- EvaluatedTargetPropertyEntry ee(entry->LinkImplItem, entry->GetBacktrace());
- cmExpandList(entry->Evaluate(thisTarget->GetLocalGenerator(), config,
- thisTarget, dagChecker, lang),
+ EvaluatedTargetPropertyEntry ee(entry.LinkImplItem, entry.GetBacktrace());
+ cmExpandList(entry.Evaluate(thisTarget->GetLocalGenerator(), config,
+ thisTarget, dagChecker, lang),
ee.Values);
- if (entry->GetHadContextSensitiveCondition()) {
+ if (entry.GetHadContextSensitiveCondition()) {
ee.ContextDependent = true;
}
return ee;
@@ -234,13 +238,14 @@ EvaluatedTargetPropertyEntry EvaluateTargetPropertyEntry(
std::vector EvaluateTargetPropertyEntries(
cmGeneratorTarget const* thisTarget, std::string const& config,
std::string const& lang, cmGeneratorExpressionDAGChecker* dagChecker,
- std::vector const& in)
+ std::vector> const&
+in)
{
std::vector out;
out.reserve(in.size());
- for (cmGeneratorTarget::TargetPropertyEntry* entry : in) {
+ for (auto& entry : in) {
out.emplace_back(EvaluateTargetPropertyEntry(thisTarget, config, lang,
- dagChecker, entry));
+ dagChecker, *entry));
}
return out;
}
@@ -304,23 +309,12 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t,
cmLocalGenerator* lg)
this->PolicyMap = t->GetPolicyMap();
}
-cmGeneratorTarget::~cmGeneratorTarget()
-{
- cmDeleteAll(this->IncludeDirectoriesEntries);
- cmDeleteAll(this->CompileOptionsEntries);
- cmDeleteAll(this->CompileFeaturesEntries);
- cmDeleteAll(this->CompileDefinitionsEnt
