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 48edbb6d42f1d091d56ea21e1b57c428d9863768 (commit)
via 3f3dbaf90b83e595f39e84969aae21e922b64eb6 (commit)
via 5fa1315b0382d0aa73aa624c35bbdedc7643a817 (commit)
via 94aa511d4e888a732ef4623923d13f2ddb79d62b (commit)
via 6bcc8c1c312ac150b8985f38a137222e4cf04d4c (commit)
via f356345dcfe0be0d056cfe7b2eb868bcf24be5cf (commit)
via dec3e9363e2ced84ef4c3a3972272c27d90a8766 (commit)
via 9df56ece79a6267ca556fd42b904de4c1642de14 (commit)
via ac1a1bf18bd3d395fd17eddbc5a38e710e737664 (commit)
via 04e5f30ad3f15d47939f5d7a8f53a7f390c6a3f5 (commit)
via 6cecb2c3d68190c0af7e5cbf7eba3ce9f2889ae5 (commit)
via bfd65c11817bb1aeedeea68adf45c9325125755c (commit)
via f1fb63b306ad06a8931ca5a00a2b9ce9e66bc12e (commit)
via 638fa41234fe2935a471377f8493718cd92f42c1 (commit)
from ab54653afd8f6671c462742dee089a2e12b2d7dc (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=48edbb6d42f1d091d56ea21e1b57c428d9863768
commit 48edbb6d42f1d091d56ea21e1b57c428d9863768
Merge: 3f3dbaf f356345
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 8 11:26:26 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Oct 8 11:26:26 2019 -0400
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f3dbaf90b83e595f39e84969aae21e922b64eb6
commit 3f3dbaf90b83e595f39e84969aae21e922b64eb6
Merge: 5fa1315 dec3e93
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 8 11:25:54 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Oct 8 11:25:54 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fa1315b0382d0aa73aa624c35bbdedc7643a817
commit 5fa1315b0382d0aa73aa624c35bbdedc7643a817
Merge: 94aa511 f1fb63b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 8 15:24:58 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Oct 8 11:25:08 2019 -0400
Merge topic 'file-GENERATE-earlier'
f1fb63b306 file(GENERATE): Create output file structures even earlier
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3895
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94aa511d4e888a732ef4623923d13f2ddb79d62b
commit 94aa511d4e888a732ef4623923d13f2ddb79d62b
Merge: 6bcc8c1 638fa41
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 8 15:23:27 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Oct 8 11:23:48 2019 -0400
Merge topic 'apple-asm-deployment-target'
638fa41234 Apple: Set Clang ASM compiler features
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3894
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bcc8c1c312ac150b8985f38a137222e4cf04d4c
commit 6bcc8c1c312ac150b8985f38a137222e4cf04d4c
Merge: ab54653 9df56ec
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 8 15:22:47 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Oct 8 11:22:55 2019 -0400
Merge topic 'vs-16.4-global-targets'
9df56ece79 Merge branch 'backport-vs-16.4-global-targets'
ac1a1bf18b VS: Tell VS 16.4 not to verify CMake-provided custom command
outputs
04e5f30ad3 VS: Tell VS 16.4 not to verify CMake-provided custom command
outputs
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3896
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dec3e9363e2ced84ef4c3a3972272c27d90a8766
commit dec3e9363e2ced84ef4c3a3972272c27d90a8766
Merge: b21e4e4 ac1a1bf
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 7 17:49:17 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Oct 7 17:51:51 2019 -0400
Merge branch 'backport-vs-16.4-global-targets' into release-3.15
Merge-request: !3896
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9df56ece79a6267ca556fd42b904de4c1642de14
commit 9df56ece79a6267ca556fd42b904de4c1642de14
Merge: 04e5f30 ac1a1bf
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 7 17:48:47 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Oct 7 17:48:47 2019 -0400
Merge branch 'backport-vs-16.4-global-targets'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac1a1bf18bd3d395fd17eddbc5a38e710e737664
commit ac1a1bf18bd3d395fd17eddbc5a38e710e737664
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 7 17:35:53 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Oct 7 17:44:32 2019 -0400
VS: Tell VS 16.4 not to verify CMake-provided custom command outputs
Extend the fix from commit 0578239d3a (VS: Tell VS 16.4 not to verify
SYMBOLIC custom command outputs, 2019-09-23, v3.15.4~2^2) to apply to
outputs in CMake-provided targets like `install`. Simply mark these
outputs as `SYMBOLIC` too since they are not actually generated.
Fixes: #19737
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 8154f3e..82a1170 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -102,6 +102,10 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
force += "/";
force += l->GetName();
force += "_force";
+ if (cmSourceFile* sf = this->Makefile->GetOrCreateSource(
+ force, true, cmSourceFileLocationKind::Known)) {
+ sf->SetProperty("SYMBOLIC", "1");
+ }
if (cmSourceFile* file = this->Makefile->AddCustomCommandToOutput(
force.c_str(), no_depends, no_main_dependency, force_commands, " ",
0, true)) {
-----------------------------------------------------------------------
Summary of changes:
.../{Apple-Clang-C.cmake => Apple-Clang-ASM.cmake} | 2 +-
Source/cmGlobalGenerator.cxx | 9 +--------
Source/cmGlobalGenerator.h | 2 --
Source/cmLocalGenerator.cxx | 14 +++++++++-----
Source/cmLocalGenerator.h | 1 +
Source/cmLocalVisualStudio7Generator.cxx | 4 ++++
6 files changed, 16 insertions(+), 16 deletions(-)
copy Modules/Platform/{Apple-Clang-C.cmake => Apple-Clang-ASM.cmake} (51%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
