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 09ea1692740698a16454f67e35041558960d11e7 (commit)
via afef984e57cdaab76df8c668803dcf7607ed0447 (commit)
from d21ed9a402e0056501539f5c2535991936131d59 (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=09ea1692740698a16454f67e35041558960d11e7
commit 09ea1692740698a16454f67e35041558960d11e7
Merge: d21ed9a afef984
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Oct 19 14:27:35 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Oct 19 14:27:35 2015 -0400
Merge topic 'use-generator-target' into next
afef984e fixup! cmGeneratorTarget: Move IsLinkable from cmTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afef984e57cdaab76df8c668803dcf7607ed0447
commit afef984e57cdaab76df8c668803dcf7607ed0447
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Oct 19 20:26:17 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon Oct 19 20:26:17 2015 +0200
fixup! cmGeneratorTarget: Move IsLinkable from cmTarget.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index fcc27ca..9af5b35 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -475,8 +475,8 @@ void
cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
di != utilDepends.end(); ++di)
{
cmTarget const* dep = *di;
- cmGeneratorTarget* gt = this->GetGeneratorTarget(dep);
- if(allowLinkable || !VSLinkable(gt) || linked.count(dep))
+ cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep);
+ if(allowLinkable || !VSLinkable(dgt) || linked.count(dep))
{
// Direct dependency allowed.
vsTargetDepend.insert(dep->GetName());
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudioGenerator.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
