[Cmake-commits] CMake branch, next, updated. v3.2.2-3099-g875ef0f

[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  875ef0f9ec7c94d79a221367a28968f360c5a573 (commit)
       via  b83c81cd68d3acadc7b49d62be4235d239e918ff (commit)
      from  062e1c69aa4ce55ca94cf33d68e26e4a685ec5ef (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=875ef0f9ec7c94d79a221367a28968f360c5a573
commit 875ef0f9ec7c94d79a221367a28968f360c5a573
Merge: 062e1c6 b83c81c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 05:12:43 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 24 05:12:43 2015 -0400

    Merge topic 'clean-up-GHS' into next
    
    b83c81cd GHS: Remove call to SetCurrentLocalGenerator.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b83c81cd68d3acadc7b49d62be4235d239e918ff
commit b83c81cd68d3acadc7b49d62be4235d239e918ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 11:10:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 11:10:58 2015 +0200

    GHS: Remove call to SetCurrentLocalGenerator.
    
    It is not needed as cmLocalGenerator::Configure does this.

diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index d6bf75c..12e64d5 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -35,9 +35,7 @@ cmGlobalGhsMultiGenerator::~cmGlobalGhsMultiGenerator()
 cmLocalGenerator *
 cmGlobalGhsMultiGenerator::CreateLocalGenerator(cmLocalGenerator* parent)
 {
-  cmLocalGenerator *lg = new cmLocalGhsMultiGenerator(this, parent);
-  this->SetCurrentLocalGenerator(lg);
-  return lg;
+  return new cmLocalGhsMultiGenerator(this, parent);
 }
 
 void cmGlobalGhsMultiGenerator::GetDocumentation(cmDocumentationEntry &entry)

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

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


hooks/post-receive
-- 
CMake