[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-125-g3af63d1

[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  3af63d13e8827bf86b53a85376c5f76a67604e4f (commit)
       via  461a70ec71dffdd5fa390ed8171b9cd2d14e0070 (commit)
       via  c6dc5dd0186349d32e756dc2e8f877567bdc0e3c (commit)
      from  449739634258340947548467f73cc8c3479c2e90 (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=3af63d13e8827bf86b53a85376c5f76a67604e4f
commit 3af63d13e8827bf86b53a85376c5f76a67604e4f
Merge: 4497396 461a70e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 17:32:36 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 17:32:36 2015 -0400

    Merge topic 'cmGeneratorTarget-sources' into next
    
    461a70ec fixup! Access sources through cmGeneratorTarget.
    c6dc5dd0 fixup! GHS: Port API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=461a70ec71dffdd5fa390ed8171b9cd2d14e0070
commit 461a70ec71dffdd5fa390ed8171b9cd2d14e0070
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 23:32:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 23:32:14 2015 +0200

    fixup! Access sources through cmGeneratorTarget.

diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 8c874f5..87cf58f 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -521,8 +521,7 @@ bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt)
   const std::string config =
     tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
   std::vector<cmSourceFile *> tgtSources;
-  cmGeneratorTarget* gt =
-      this->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
   gt->GetSourceFiles(tgtSources, config);
   bool tgtInBuild = true;
   char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6dc5dd0186349d32e756dc2e8f877567bdc0e3c
commit c6dc5dd0186349d32e756dc2e8f877567bdc0e3c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 23:30:39 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 23:30:55 2015 +0200

    fixup! GHS: Port API to cmGeneratorTarget.

diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index e66bc2a..8c874f5 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -509,7 +509,8 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
                                        splitPath.back());
       *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile
                                                   << " ";
-      GhsMultiGpj::WriteGpjTag(cmGhsMultiTargetGenerator::GetGpjTag(tgt),
+      GhsMultiGpj::WriteGpjTag(cmGhsMultiTargetGenerator::GetGpjTag(
+                                 tgtsI->second),
                                this->TargetFolderBuildStreams[folderName]);
       }
     }

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

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


hooks/post-receive
-- 
CMake