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, next has been updated
via a1d30dcccfa79e3f79ab13c88749a8d0f04f14aa (commit)
via 3fab1fef23476b27274cddf4bb8f6cbe8d36c712 (commit)
from df4c1374fb8c4e1a966fc3610c4af0fc13d05fd5 (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=a1d30dcccfa79e3f79ab13c88749a8d0f04f14aa
commit a1d30dcccfa79e3f79ab13c88749a8d0f04f14aa
Merge: df4c137 3fab1fe
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Fri Sep 16 17:31:48 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Sep 16 17:31:48 2016 -0400
Merge topic 'clang-tidy-fixes' into next
3fab1fef cmNinjaNormalTargetGenerator: make sure comments match parameter
names
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fab1fef23476b27274cddf4bb8f6cbe8d36c712
commit 3fab1fef23476b27274cddf4bb8f6cbe8d36c712
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Fri Sep 16 23:31:37 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Fri Sep 16 23:31:37 2016 +0200
cmNinjaNormalTargetGenerator: make sure comments match parameter names
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx
b/Source/cmNinjaNormalTargetGenerator.cxx
index 335b552..b2384b0 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -336,7 +336,7 @@ std::vector<std::string>
cmNinjaNormalTargetGenerator::ComputeLinkCmd()
std::string targetOutputReal =
this->ConvertToNinjaPath(gt.GetFullPath(cfgName,
/*implib=*/false,
- /*realpath=*/true));
+ /*realname=*/true));
cmakeCommand += targetOutputReal;
cmakeCommand += " || true";
linkCmds.push_back(cmakeCommand);
@@ -414,7 +414,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
std::string targetOutputReal =
ConvertToNinjaPath(gt.GetFullPath(cfgName,
/*implib=*/false,
- /*realpath=*/true));
+ /*realname=*/true));
std::string targetOutputImplib =
ConvertToNinjaPath(gt.GetFullPath(cfgName,
/*implib=*/true));
-----------------------------------------------------------------------
Summary of changes:
Source/cmNinjaNormalTargetGenerator.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
