[Cmake-commits] CMake branch, next, updated. v3.3.2-3133-gd83fd9c

[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  d83fd9c217a0b4ded9192cb3bfd9aa6491bdb7be (commit)
       via  1e93f285d05f0ded484e036673c82da7cfff9d28 (commit)
      from  41e188f2887bc5dbec025ef3681f7f52ff17dcb2 (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=d83fd9c217a0b4ded9192cb3bfd9aa6491bdb7be
commit d83fd9c217a0b4ded9192cb3bfd9aa6491bdb7be
Merge: 41e188f 1e93f28
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 20 09:07:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 20 09:07:59 2015 -0400

    Merge topic 'fix-max-path-initialization' into next
    
    1e93f285 Revert topic.


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

    Revert topic.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3f14e72..33b04ac 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1089,18 +1089,6 @@ void cmGlobalGenerator::ClearEnabledLanguages()
   return this->CMakeInstance->GetState()->ClearEnabledLanguages();
 }
 
-void cmGlobalGenerator::CreateLocalGenerators()
-{
-  cmDeleteAll(this->LocalGenerators);
-  this->LocalGenerators.clear();
-  this->LocalGenerators.reserve(this->Makefiles.size());
-  for (std::vector<cmMakefile*>::const_iterator it = this->Makefiles.begin();
-       it != this->Makefiles.end(); ++it)
-    {
-    this->LocalGenerators.push_back(this->CreateLocalGenerator(*it));
-    }
-}
-
 void cmGlobalGenerator::Configure()
 {
   this->FirstTimeProgress = 0.0f;
@@ -1109,6 +1097,8 @@ void cmGlobalGenerator::Configure()
   cmMakefile* dirMf =
       new cmMakefile(this, this->GetCMakeInstance()->GetCurrentSnapshot());
   this->Makefiles.push_back(dirMf);
+  cmLocalGenerator *lg = this->CreateLocalGenerator(dirMf);
+  this->LocalGenerators.push_back(lg);
 
   // set the Start directories
   dirMf->SetCurrentSourceDirectory
@@ -1180,7 +1170,6 @@ void cmGlobalGenerator::Configure()
 
 void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
 {
-  this->CreateLocalGenerators();
   cmDeleteAll(this->GeneratorTargets);
   this->GeneratorTargets.clear();
   this->CreateGeneratorTargets(targetTypes);
@@ -1252,6 +1241,11 @@ bool cmGlobalGenerator::Compute()
 
   unsigned int i;
 
+  for (i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    this->LocalGenerators[i]->ComputeObjectMaxPath();
+    }
+
   // Add generator specific helper commands
   for (i = 0; i < this->LocalGenerators.size(); ++i)
     {
@@ -1937,6 +1931,12 @@ void cmGlobalGenerator::AddMakefile(cmMakefile *mf)
   this->CMakeInstance->UpdateProgress("Configuring", prog);
 }
 
+//----------------------------------------------------------------------------
+void cmGlobalGenerator::AddLocalGenerator(cmLocalGenerator *lg)
+{
+  this->LocalGenerators.push_back(lg);
+}
+
 void cmGlobalGenerator::AddInstallComponent(const char* component)
 {
   if(component && *component)
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 608381d..9fc2d45 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -186,6 +186,7 @@ public:
   {this->CurrentMakefile = mf;}
 
   void AddMakefile(cmMakefile *mf);
+  void AddLocalGenerator(cmLocalGenerator *lg);
 
   ///! Set an generator for an "external makefile based project"
   void SetExternalMakefileProjectGenerator(
@@ -463,8 +464,6 @@ private:
 
   virtual void ForceLinkerLanguages();
 
-  void CreateLocalGenerators();
-
   void CheckCompilerIdCompatibility(cmMakefile* mf,
                                     std::string const& lang) const;
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3ad4abe..97a9f1e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -54,8 +54,6 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
   this->EmitUniversalBinaryFlags = true;
   this->BackwardsCompatibility = 0;
   this->BackwardsCompatibilityFinal = false;
-
-  this->ComputeObjectMaxPath();
 }
 
 cmLocalGenerator::~cmLocalGenerator()
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 6ea414a..771131f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -300,6 +300,7 @@ public:
   void CreateEvaluationFileOutputs(const std::string& config);
   void ProcessEvaluationFiles(std::vector<std::string>& generatedFiles);
 
+  void ComputeObjectMaxPath();
 protected:
   ///! put all the libraries for a target on into the given stream
   void OutputLinkLibraries(std::string& linkLibraries,
@@ -359,8 +360,6 @@ private:
   bool GetShouldUseOldFlags(bool shared, const std::string &lang) const;
   void AddPositionIndependentFlags(std::string& flags, std::string const& l,
                                    int targetType);
-
-  void ComputeObjectMaxPath();
 };
 
 #endif
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6480667..8a3d197 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1756,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/cmGlobalGenerator.cxx |   26 +++++++++++++-------------
 Source/cmGlobalGenerator.h   |    3 +--
 Source/cmLocalGenerator.cxx  |    2 --
 Source/cmLocalGenerator.h    |    3 +--
 Source/cmMakefile.cxx        |    5 +++++
 5 files changed, 20 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake