[Cmake-commits] CMake branch, next, updated. v3.3.2-3135-g8a51c00

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

    Merge topic 'fixup-compile' into next
    
    f8e75944 Add conflict hunk.


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

    Add conflict hunk.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 8a3d197..89de3f8 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1777,6 +1777,11 @@ 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:


hooks/post-receive
-- 
CMake