[Cmake-commits] CMake branch, next, updated. v3.2.2-3019-g9cd3196

[Brad King]

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  9cd31962d5c683cb8b7a08169af356685f581b16 (commit)
       via  8bd3ff78566cfae73207a6609215f8e7f25ce88d (commit)
      from  6e7f5313aae143287e158b1e1d38765b85fcf291 (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=9cd31962d5c683cb8b7a08169af356685f581b16
commit 9cd31962d5c683cb8b7a08169af356685f581b16
Merge: 6e7f531 8bd3ff7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 20 11:16:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 20 11:16:48 2015 -0400

    Merge topic 'clean-up-cmLocalGenerator' into next
    
    8bd3ff78 Revert "cmGlobalGenerator: Use a variable to add some uniformity."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bd3ff78566cfae73207a6609215f8e7f25ce88d
commit 8bd3ff78566cfae73207a6609215f8e7f25ce88d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 20 10:59:26 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 20 11:16:31 2015 -0400

    Revert "cmGlobalGenerator: Use a variable to add some uniformity."
    
    This reverts commit 45073513a283ab318fc0a5cd9a63cb3999dcfec3.
    The local variable is changing but the reference the commit replaced
    is to its original value.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d92f359..1ca2c95 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2005,7 +2005,7 @@ void cmGlobalGenerator::FillProjectMap()
       if (name != lg->GetMakefile()->GetProjectName())
         {
         name = lg->GetMakefile()->GetProjectName();
-        this->ProjectMap[name].push_back(lg);
+        this->ProjectMap[name].push_back(this->LocalGenerators[i]);
         }
       lg = lg->GetParent();
       }

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake