[Cmake-commits] CMake branch, next, updated. v3.3.0-1808-g910b102

[Brad King]

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  910b10207f43694f66036569b5604b023d39ab03 (commit)
       via  354bbd881d3e46aa40e2a566967174682c0521b2 (commit)
      from  1341adc5d45a5273c1e36904a2957e151fdaa1c9 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=910b10207f43694f66036569b5604b023d39ab03
commit 910b10207f43694f66036569b5604b023d39ab03
Merge: 1341adc 354bbd8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 3 16:42:10 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 3 16:42:10 2015 -0400

    Merge topic 'use-generator-target' into next
    
    354bbd88 fixup! cmGeneratorTarget: Move GetFullName from cmTarget.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=354bbd881d3e46aa40e2a566967174682c0521b2
commit 354bbd881d3e46aa40e2a566967174682c0521b2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 3 16:40:57 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 3 16:40:57 2015 -0400

    fixup! cmGeneratorTarget: Move GetFullName from cmTarget.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index e1fa7d4..29e1034 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1112,14 +1112,15 @@ void cmLocalVisualStudio6Generator
       // Compute the proper name to use to link this library.
       std::string lib;
       std::string libDebug;
-      cmGeneratorTarget* tgt = this->GlobalGenerator->GetGeneratorTarget(
-          this->GlobalGenerator->FindTarget(j->first.c_str()));
+      cmTarget* tgt = this->GlobalGenerator->FindTarget(j->first.c_str());
       if(tgt)
         {
+        cmGeneratorTarget* gt =
+          this->GlobalGenerator->GetGeneratorTarget(tgt);
         lib = cmSystemTools::GetFilenameWithoutExtension
-          (tgt->GetFullName().c_str());
+          (gt->GetFullName().c_str());
         libDebug = cmSystemTools::GetFilenameWithoutExtension
-          (tgt->GetFullName("Debug").c_str());
+          (gt->GetFullName("Debug").c_str());
         lib += ".lib";
         libDebug += ".lib";
         }

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

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake