[Cmake-commits] CMake branch, next, updated. v3.3.2-3122-g152d75e

[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  152d75e3e010dd5e661af402f4085268b8cb70f1 (commit)
       via  b8998e6df2ff8175dbb102736b376def4b96503f (commit)
       via  d2f678dd713355a30a857c33cbf927753c9d8c8c (commit)
      from  25f005d61282de0d8b68391fe4feb26dde037e0e (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=152d75e3e010dd5e661af402f4085268b8cb70f1
commit 152d75e3e010dd5e661af402f4085268b8cb70f1
Merge: 25f005d b8998e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 08:54:40 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 20 08:54:40 2015 -0400

    Merge topic 'fix-max-path-initialization' into next
    
    b8998e6d cmMakefile: Create the local generator after configuring the makefile.
    d2f678dd Revert "cmMakefile: Create the local generator after configuring the makefile."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8998e6df2ff8175dbb102736b376def4b96503f
commit b8998e6df2ff8175dbb102736b376def4b96503f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 20:31:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 20 14:54:11 2015 +0200

    cmMakefile: Create the local generator after configuring the makefile.
    
    The local generator is not used during configure time.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 8a3d197..720a5e4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1756,11 +1756,6 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
   cmMakefile* subMf = new cmMakefile(this->GlobalGenerator, newSnapshot);
   this->GetGlobalGenerator()->AddMakefile(subMf);
 
-  // create a new local generator and set its parent
-  cmLocalGenerator *lg2 = this->GetGlobalGenerator()
-        ->CreateLocalGenerator(subMf);
-  this->GetGlobalGenerator()->AddLocalGenerator(lg2);
-
   // set the subdirs start dirs
   subMf->SetCurrentSourceDirectory(srcPath);
   subMf->SetCurrentBinaryDirectory(binPath);
@@ -1777,6 +1772,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)

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

    Revert "cmMakefile: Create the local generator after configuring the makefile."
    
    This reverts commit 26cae90ba94639139cc788b8572ac77d22e1b5d1.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 93aa3e4..8a3d197 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1680,11 +1680,6 @@ void cmMakefile::Configure()
 
   this->AddCMakeDependFilesFromUser();
   this->SetConfigured();
-
-  // create a new local generator and set its parent
-  cmLocalGenerator *lg2 = this->GetGlobalGenerator()
-        ->CreateLocalGenerator(this);
-  this->GetGlobalGenerator()->AddLocalGenerator(lg2);
 }
 
 void cmMakefile::ConfigureSubDirectory(cmMakefile *mf)
@@ -1761,6 +1756,11 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
   cmMakefile* subMf = new cmMakefile(this->GlobalGenerator, newSnapshot);
   this->GetGlobalGenerator()->AddMakefile(subMf);
 
+  // create a new local generator and set its parent
+  cmLocalGenerator *lg2 = this->GetGlobalGenerator()
+        ->CreateLocalGenerator(subMf);
+  this->GetGlobalGenerator()->AddLocalGenerator(lg2);
+
   // set the subdirs start dirs
   subMf->SetCurrentSourceDirectory(srcPath);
   subMf->SetCurrentBinaryDirectory(binPath);

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

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


hooks/post-receive
-- 
CMake