[Cmake-commits] CMake branch, next, updated. v3.3.2-3137-gf820b7d

[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  f820b7d4700407c0adaf92384c8b90505facc403 (commit)
       via  f8c9ef8166b8c712de5b8e42a1e13b6f97de4637 (commit)
      from  8a51c00fa602978c21690a26ed6e9be453522a2b (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=f820b7d4700407c0adaf92384c8b90505facc403
commit f820b7d4700407c0adaf92384c8b90505facc403
Merge: 8a51c00 f8c9ef8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 10:08:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 20 10:08:22 2015 -0400

    Merge topic 'fixup-compile' into next
    
    f8c9ef81 Revert "Add conflict hunk."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8c9ef8166b8c712de5b8e42a1e13b6f97de4637
commit f8c9ef8166b8c712de5b8e42a1e13b6f97de4637
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 16:08:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 16:08:10 2015 +0200

    Revert "Add conflict hunk."
    
    This reverts commit f8e759449c838dda772f8661aef526ae972f4717.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 89de3f8..8a3d197 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1777,11 +1777,6 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
     {
     this->UnConfiguredDirectories.push_back(subMf);
     }
-
-  // create a new local generator and set its parent
-  cmLocalGenerator *lg2 = this->GetGlobalGenerator()
-        ->CreateLocalGenerator(subMf);
-  this->GetGlobalGenerator()->AddLocalGenerator(lg2);
 }
 
 void cmMakefile::SetCurrentSourceDirectory(const std::string& dir)

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

Summary of changes:
 Source/cmMakefile.cxx |    5 -----
 1 file changed, 5 deletions(-)


hooks/post-receive
-- 
CMake