[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-583-g108dbde

[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  108dbdef5770dbf289c93d17c95834f104033744 (commit)
       via  d403585544108ad363abee509aca3ec4c333d8e3 (commit)
      from  c9f6b5dc97b82d5fbbf1d45e99e3f2bcda052768 (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=108dbdef5770dbf289c93d17c95834f104033744
commit 108dbdef5770dbf289c93d17c95834f104033744
Merge: c9f6b5d d403585
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 21 16:08:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 21 16:08:54 2015 -0400

    Merge topic 'use-generator-target' into next
    
    d4035855 fixup! GHS: Use a cmGeneratorTarget in generator API.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d403585544108ad363abee509aca3ec4c333d8e3
commit d403585544108ad363abee509aca3ec4c333d8e3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 21 22:08:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 21 22:08:33 2015 +0200

    fixup! GHS: Use a cmGeneratorTarget in generator API.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index da371b1..14efc3e 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -355,11 +355,11 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
 {
   // library directories
   cmTargetDependSet tds =
-    this->GetGlobalGenerator()->GetTargetDirectDepends(this->GeneratorTarget);
+    this->GetGlobalGenerator()->GetTargetDirectDepends(*this->Target);
   for (cmTargetDependSet::iterator tdsI = tds.begin(); tdsI != tds.end();
        ++tdsI)
     {
-    const cmTarget *tg = (*tdsI)->Target;
+    const cmTarget *tg(*tdsI);
     *this->GetFolderBuildStreams() << "    -L\"" << GetAbsBuildFilePath(tg)
                                    << "\"" << std::endl;
     }
@@ -374,8 +374,6 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
     cmTarget *tg(GetGlobalGenerator()->FindTarget(libName));
     if (NULL != tg)
       {
-      cmGeneratorTarget* gt = GetGlobalGenerator()->GetGeneratorTarget(tg);
-      cmGhsMultiTargetGenerator gmtg(gt);
       libName = tg->GetName() + ".a";
       }
     *this->GetFolderBuildStreams() << "    -l\"" << libName << "\""

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

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


hooks/post-receive
-- 
CMake