[Cmake-commits] CMake branch, next, updated. v3.3.1-2493-g0c1b27f

[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  0c1b27f050d3890cef1fd621a36cc53bd9dda7b7 (commit)
       via  87892dcb3dbaf65489caacf2e5eb2a5a26b711a6 (commit)
       via  873c9f072c79bc6a80fe5acb8c0386665cf979ef (commit)
      from  9bfcb9d4edc48a47beff5bdeb0e476012ef3fce9 (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=0c1b27f050d3890cef1fd621a36cc53bd9dda7b7
commit 0c1b27f050d3890cef1fd621a36cc53bd9dda7b7
Merge: 9bfcb9d 87892dc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 17:26:29 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 25 17:26:29 2015 -0400

    Merge topic 'use-generator-target' into next
    
    87892dcb simplify.
    873c9f07 simplify


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87892dcb3dbaf65489caacf2e5eb2a5a26b711a6
commit 87892dcb3dbaf65489caacf2e5eb2a5a26b711a6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 23:26:01 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 25 23:26:06 2015 +0200

    simplify.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9fb8375..5c83879 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4440,7 +4440,7 @@ bool cmGeneratorTarget::GetConfigCommonSourceFiles(
       e << "Target \"" << this->GetName()
         << "\" has source files which vary by "
         "configuration. This is not supported by the \""
-        << this->LocalGenerator->GetGlobalGenerator()->GetName()
+        << this->GlobalGenerator->GetName()
         << "\" generator.\n"
           "Config \"" << firstConfig << "\":\n"
           "  " << firstConfigFiles << "\n"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=873c9f072c79bc6a80fe5acb8c0386665cf979ef
commit 873c9f072c79bc6a80fe5acb8c0386665cf979ef
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 23:25:18 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 25 23:25:56 2015 +0200

    simplify

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9390b92..9fb8375 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4479,7 +4479,7 @@ void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages,
     for (std::vector<cmTarget*>::const_iterator it = objectTargets.begin();
          it != objectTargets.end(); ++it)
       {
-      objectLibraries.push_back(this->LocalGenerator->GetGlobalGenerator()
+      objectLibraries.push_back(this->GlobalGenerator
                                 ->GetGeneratorTarget(*it));
       }
     }
@@ -4492,7 +4492,7 @@ void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages,
       std::string objLib = (*i)->GetObjectLibrary();
       if (cmTarget* tgt = this->Makefile->FindTargetToUse(objLib))
         {
-        objectLibraries.push_back(this->LocalGenerator->GetGlobalGenerator()
+        objectLibraries.push_back(this->GlobalGenerator
                                   ->GetGeneratorTarget(tgt));
         }
       }

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

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


hooks/post-receive
-- 
CMake