[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-299-gc2b8218

[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  c2b8218563aa73173833131b1b107511f765dc28 (commit)
       via  c1528cf8ae58cf8b37c3e0bd6ecdb1e18ec4b7d0 (commit)
      from  541191bf9bf9da11893f4a4e0aef7315db8637ad (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=c2b8218563aa73173833131b1b107511f765dc28
commit c2b8218563aa73173833131b1b107511f765dc28
Merge: 541191b c1528cf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 8 18:02:37 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 8 18:02:37 2015 -0400

    Merge topic 'use-generator-target' into next
    
    c1528cf8 Compile Fixups.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1528cf8ae58cf8b37c3e0bd6ecdb1e18ec4b7d0
commit c1528cf8ae58cf8b37c3e0bd6ecdb1e18ec4b7d0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 9 00:02:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 9 00:02:06 2015 +0200

    Compile Fixups.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 83b6cff..da371b1 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -23,21 +23,22 @@ std::string const cmGhsMultiTargetGenerator::DDOption("-dynamic");
 
 cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget *target)
   : Target(target->Target)
+  , GeneratorTarget(target)
   , LocalGenerator(static_cast<cmLocalGhsMultiGenerator *>(
                      target->GetLocalGenerator()))
   , Makefile(target->Target->GetMakefile())
   , TargetGroup(DetermineIfTargetGroup(target->Target))
   , DynamicDownload(false)
 {
-  this->RelBuildFilePath = this->GetRelBuildFilePath(target);
+  this->RelBuildFilePath = this->GetRelBuildFilePath(target->Target);
 
   this->RelOutputFileName =
     this->RelBuildFilePath + this->Target->GetName() + ".a";
 
   this->RelBuildFileName = this->RelBuildFilePath;
-  this->RelBuildFileName += this->GetBuildFileName(target);
+  this->RelBuildFileName += this->GetBuildFileName(target->Target);
 
-  std::string absPathToRoot = this->GetAbsPathToRoot(target);
+  std::string absPathToRoot = this->GetAbsPathToRoot(target->Target);
   absPathToRoot = this->AddSlashIfNeededToPath(absPathToRoot);
   this->AbsBuildFilePath = absPathToRoot + this->RelBuildFilePath;
   this->AbsBuildFileName = absPathToRoot + this->RelBuildFileName;
@@ -354,11 +355,11 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
 {
   // library directories
   cmTargetDependSet tds =
-    this->GetGlobalGenerator()->GetTargetDirectDepends(*this->Target);
+    this->GetGlobalGenerator()->GetTargetDirectDepends(this->GeneratorTarget);
   for (cmTargetDependSet::iterator tdsI = tds.begin(); tdsI != tds.end();
        ++tdsI)
     {
-    const cmTarget *tg(*tdsI);
+    const cmTarget *tg = (*tdsI)->Target;
     *this->GetFolderBuildStreams() << "    -L\"" << GetAbsBuildFilePath(tg)
                                    << "\"" << std::endl;
     }
@@ -373,7 +374,8 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
     cmTarget *tg(GetGlobalGenerator()->FindTarget(libName));
     if (NULL != tg)
       {
-      cmGhsMultiTargetGenerator gmtg(tg);
+      cmGeneratorTarget* gt = GetGlobalGenerator()->GetGeneratorTarget(tg);
+      cmGhsMultiTargetGenerator gmtg(gt);
       libName = tg->GetName() + ".a";
       }
     *this->GetFolderBuildStreams() << "    -l\"" << libName << "\""
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index fc9532a..f268071 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -100,6 +100,7 @@ private:
                                   const std::string &language);
 
   cmTarget *Target;
+  cmGeneratorTarget GeneratorTarget;
   cmLocalGhsMultiGenerator *LocalGenerator;
   cmMakefile *Makefile;
   std::string AbsBuildFilePath;
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 8723956..475f079 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -307,7 +307,7 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
       {
       if(di->IsLink())
         {
-        this->FillLinkClosure(di->Target, linked);
+        this->FillLinkClosure((*di)->Target, linked);
         }
       }
     }
@@ -322,8 +322,7 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
     {
     TargetSetMap::value_type entry(target, TargetSet());
     i = this->TargetLinkClosure.insert(entry).first;
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    this->FillLinkClosure(gt, i->second);
+    this->FillLinkClosure(target, i->second);
     }
   return i->second;
 }
@@ -348,7 +347,7 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends(
       {
       if(di->IsLink())
         {
-        this->FollowLinkDepends(di->Target, linked);
+        this->FollowLinkDepends((*di)->Target->Target, linked);
         }
       }
     }

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

Summary of changes:
 Source/cmGhsMultiTargetGenerator.cxx     |   14 ++++++++------
 Source/cmGhsMultiTargetGenerator.h       |    1 +
 Source/cmGlobalVisualStudioGenerator.cxx |    7 +++----
 3 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake