[Cmake-commits] CMake branch, next, updated. v3.3.0-1356-g7b87cb1

[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  7b87cb1016aef245dc4e7181afaa14bc5495d49e (commit)
       via  ab2fe730640fb34ee1df3eddad1801ca102193f5 (commit)
      from  415de942f70dc90820fcb257ec2f6b44923a41b4 (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=7b87cb1016aef245dc4e7181afaa14bc5495d49e
commit 7b87cb1016aef245dc4e7181afaa14bc5495d49e
Merge: 415de94 ab2fe73
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 26 06:16:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 26 06:16:22 2015 -0400

    Merge topic 'use-generator-target' into next
    
    ab2fe730 Fix build.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab2fe730640fb34ee1df3eddad1801ca102193f5
commit ab2fe730640fb34ee1df3eddad1801ca102193f5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 26 12:15:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jul 26 12:15:58 2015 +0200

    Fix build.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index c810550..ba5ff30 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1668,7 +1668,7 @@ void  cmGlobalXCodeGenerator
   for(std::vector<cmCustomCommand>::const_iterator i = commands.begin();
       i != commands.end(); ++i)
     {
-    cmCustomCommandGenerator ccg(*i, configName, this->CurrentMakefile);
+    cmCustomCommandGenerator ccg(*i, configName, this->CurrentLocalGenerator);
     if(ccg.GetNumberOfCommands() > 0)
       {
       const std::vector<std::string>& outputs = ccg.GetOutputs();
@@ -1694,7 +1694,7 @@ void  cmGlobalXCodeGenerator
   for(std::vector<cmCustomCommand>::const_iterator i = commands.begin();
       i != commands.end(); ++i)
     {
-    cmCustomCommandGenerator ccg(*i, configName, this->CurrentMakefile);
+    cmCustomCommandGenerator ccg(*i, configName, this->CurrentLocalGenerator);
     if(ccg.GetNumberOfCommands() > 0)
       {
       makefileStream << "\n";

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

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


hooks/post-receive
-- 
CMake