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 e5d298b8fdb12283291f37048ae8f68a60a6becb (commit) via 066db7576dda43c6a716b4201c0399a1e3ae9c2b (commit) via 36280e6157e883fb5257f211d24582b5e7ff4244 (commit) via 4cd059480a40cc4a2c7e326f8bb1fe11fe46ba0c (commit) via 85aceda0262bff58a0126b2d4e75756e0507fe3c (commit) from b83420e45d963e2decd94336b97c127c75eed990 (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=e5d298b8fdb12283291f37048ae8f68a60a6becb commit e5d298b8fdb12283291f37048ae8f68a60a6becb Merge: 066db75 85aceda Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Nov 5 12:50:13 2018 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Mon Nov 5 07:50:20 2018 -0500 Merge topic 'lwyu-hides-link-error' 85aceda026 cmNinjaNormalTargetGenerator: don't use `|| true` for link-what-you-use Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !2546 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=066db7576dda43c6a716b4201c0399a1e3ae9c2b commit 066db7576dda43c6a716b4201c0399a1e3ae9c2b Merge: b83420e 36280e6 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Nov 5 07:49:06 2018 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Nov 5 07:49:06 2018 -0500 Merge branch 'release-3.13' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85aceda0262bff58a0126b2d4e75756e0507fe3c commit 85aceda0262bff58a0126b2d4e75756e0507fe3c Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Mon Oct 29 15:49:44 2018 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Fri Nov 2 10:25:56 2018 -0400 cmNinjaNormalTargetGenerator: don't use `|| true` for link-what-you-use With the `|| true`, a linker error before running link-what-you-use would also use the `|| true` fragment and unconditionally succeed. Just skip the addition since `--lwyu=` ignores the return value anyways. Fixes #18524 diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 6436969..1386706 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -506,7 +506,6 @@ std::vector<std::string> cmNinjaNormalTargetGenerator::ComputeLinkCmd() gt.GetFullPath(cfgName, cmStateEnums::RuntimeBinaryArtifact, /*realname=*/true)); cmakeCommand += targetOutputReal; - cmakeCommand += " || true"; linkCmds.push_back(std::move(cmakeCommand)); } return linkCmds; ----------------------------------------------------------------------- Summary of changes: Source/cmNinjaNormalTargetGenerator.cxx | 1 - 1 file changed, 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits