[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-927-g5a023c8

[Stephen Kelly]

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  5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87 (commit)
       via  7de7776d7f01054c97e3ca4498cc0f7d8ce106e8 (commit)
      from  addb1dad4f1f99e054f3fc3e0f94d571ef8842c8 (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=5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87
commit 5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87
Merge: addb1da 7de7776
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 03:08:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 24 03:08:50 2015 -0400

    Merge topic 'use-generator-target' into next
    
    7de7776d fixup! VS: Port interface to cmGeneratorTarget


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7de7776d7f01054c97e3ca4498cc0f7d8ce106e8
commit 7de7776d7f01054c97e3ca4498cc0f7d8ce106e8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 09:08:03 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:08:03 2015 +0200

    fixup! VS: Port interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 7ee5dd0..b819dad 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -307,7 +307,7 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
         const cmGeneratorTarget *target,
         TargetSet& linked)
 {
-  if(linked.insert(target->Target).second)
+  if(linked.insert(target).second)
     {
     TargetDependSet const& depends =
             this->GetTargetDirectDepends(target);
@@ -326,10 +326,10 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
 cmGlobalVisualStudioGenerator::TargetSet const&
 cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 {
-  TargetSetMap::iterator i = this->TargetLinkClosure.find(target->Target);
+  TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
   if(i == this->TargetLinkClosure.end())
     {
-    TargetSetMap::value_type entry(target->Target, TargetSet());
+    TargetSetMap::value_type entry(target, TargetSet());
     i = this->TargetLinkClosure.insert(entry).first;
     this->FillLinkClosure(target, i->second);
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake