[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-828-g9d230d9

[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  9d230d94b91625ed2edaae73649b0371013cf54a (commit)
       via  3dce55492f97de80f455a53d5bce4178f2ae11a7 (commit)
      from  7b38cda3bc92ab002b19020a1c201552d039a6fc (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=9d230d94b91625ed2edaae73649b0371013cf54a
commit 9d230d94b91625ed2edaae73649b0371013cf54a
Merge: 7b38cda 3dce554
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 17:20:44 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 17:20:44 2015 -0400

    Merge topic 'use-generator-target' into next
    
    3dce5549 fixup! GHS: Port to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dce55492f97de80f455a53d5bce4178f2ae11a7
commit 3dce55492f97de80f455a53d5bce4178f2ae11a7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 23:19:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:20:02 2015 +0200

    fixup! GHS: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index e260049..1bcbd26 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -487,7 +487,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
        tgtsI != tgts.end(); ++tgtsI)
     {
     const cmGeneratorTarget *tgt = *tgtsI;
-    if (IsTgtForBuild(tgt->Target))
+    if (IsTgtForBuild(tgt))
       {
       char const *rawFolderName = tgt->GetProperty("FOLDER");
       if (NULL == rawFolderName)
@@ -504,7 +504,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
           GhsMultiGpj::PROJECT);
         }
       std::vector<cmsys::String> splitPath = cmSystemTools::SplitString(
-            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt->Target));
+            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt));
       std::string foldNameRelBuildFile(*(splitPath.end() - 2) + "/" +
                                        splitPath.back());
       *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile

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

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


hooks/post-receive
-- 
CMake