[Cmake-commits] CMake branch, next, updated. v3.3.0-1538-gb676998

[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  b676998c3dab97c953a71eb3368b71fc521b239a (commit)
       via  433b71f2084e0690e6ee37712745399f63c2b242 (commit)
      from  ba0ba5da9319c34f1f9fb50178c9d76f90e14f20 (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=b676998c3dab97c953a71eb3368b71fc521b239a
commit b676998c3dab97c953a71eb3368b71fc521b239a
Merge: ba0ba5d 433b71f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 30 02:26:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 30 02:26:53 2015 -0400

    Merge topic 'refactor-install' into next
    
    433b71f2 fixup! cmGlobalGenerator: Move generation object creation to Compute().


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=433b71f2084e0690e6ee37712745399f63c2b242
commit 433b71f2084e0690e6ee37712745399f63c2b242
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 30 08:26:07 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 30 08:26:07 2015 +0200

    fixup! cmGlobalGenerator: Move generation object creation to Compute().

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index c129c4c..7dea107 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -463,8 +463,8 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   cmTarget* allbuild = mf->AddUtilityCommand("ALL_BUILD", true, no_depends,
                         no_working_directory,
                         "echo", "Build all projects");
-  cmGeneratorTarget* gt = new cmGeneratorTarget(allbuild, root);
-  mf->AddGeneratorTarget(allbuild, gt);
+  cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
+  mf->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = mf->GetCurrentSourceDirectory();
@@ -497,8 +497,8 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           true, no_depends,
                           no_working_directory,
                           "make", "-f", file.c_str());
-    cmGeneratorTarget* gt = new cmGeneratorTarget(check, root);
-    mf->AddGeneratorTarget(check, gt);
+    cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
+    mf->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets

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

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


hooks/post-receive
-- 
CMake