[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-518-g0013c5c

[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  0013c5cad94e4e3c61a4f3eceafeb382bdc36969 (commit)
       via  10d662d477f63604e2370c84c5d47f565d519433 (commit)
      from  2ee565e6f2795a90b7a4821cda7cbf23070efa5a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0013c5cad94e4e3c61a4f3eceafeb382bdc36969
commit 0013c5cad94e4e3c61a4f3eceafeb382bdc36969
Merge: 2ee565e 10d662d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 14:58:12 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 14:58:12 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    10d662d4 fixup! cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10d662d477f63604e2370c84c5d47f565d519433
commit 10d662d477f63604e2370c84c5d47f565d519433
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 20:57:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 13 20:57:30 2015 +0200

    fixup! cmMakefile: Store container of cmExportBuildFileGenerators.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 8f5e84a..e8be2d6 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -73,7 +73,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   this->CurrentMakefile = 0;
   this->TryCompileOuterMakefile = 0;
 
-  this->ConfigureDoneCMP0026 = false;
+  this->ConfigureDoneCMP0026AndCMP0024 = false;
 }
 
 cmGlobalGenerator::~cmGlobalGenerator()
@@ -234,6 +234,16 @@ bool cmGlobalGenerator::GenerateImportFile(const std::string &file)
   if (it != this->BuildExportSets.end())
     {
     bool result = it->second->GenerateImportFile();
+
+    if (!this->ConfigureDoneCMP0026AndCMP0024)
+      {
+      for (std::vector<cmMakefile*>::const_iterator mit =
+           this->Makefiles.begin(); mit != this->Makefiles.end(); ++mit)
+        {
+        (*mit)->RemoveExportBuildFileGeneratorCMP0024(it->second);
+        }
+      }
+
     delete it->second;
     it->second = 0;
     this->BuildExportSets.erase(it);
@@ -1122,11 +1132,11 @@ void cmGlobalGenerator::Configure()
       this->CMakeInstance->GetHomeOutputDirectory());
 
   // now do it
-  this->ConfigureDoneCMP0026 = false;
+  this->ConfigureDoneCMP0026AndCMP0024 = false;
   dirMf->Configure();
   dirMf->EnforceDirectoryLevelRules();
 
-  this->ConfigureDoneCMP0026 = true;
+  this->ConfigureDoneCMP0026AndCMP0024 = true;
 
   // Put a copy of each global target in every directory.
   cmTargets globalTargets;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 294fca9..432b57c 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -362,7 +362,7 @@ public:
   cmFileLockPool& GetFileLockPool() { return FileLockPool; }
 #endif
 
-  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; }
+  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026AndCMP0024; }
 
   void ComputeBuildFileGenerators();
 
@@ -522,7 +522,7 @@ protected:
   bool ForceUnixPaths;
   bool ToolSupportsColor;
   bool InstallTargetEnabled;
-  bool ConfigureDoneCMP0026;
+  bool ConfigureDoneCMP0026AndCMP0024;
 };
 
 #endif
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 61832ba..8ac6358 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -708,6 +708,18 @@ cmMakefile::GetExportBuildFileGenerators() const
   return this->ExportBuildFileGenerators;
 }
 
+void cmMakefile::RemoveExportBuildFileGeneratorCMP0024(
+    cmExportBuildFileGenerator* gen)
+{
+  std::vector<cmExportBuildFileGenerator*>::iterator it =
+      std::find(this->ExportBuildFileGenerators.begin(),
+                this->ExportBuildFileGenerators.end(), gen);
+  if(it != this->ExportBuildFileGenerators.end())
+    {
+    this->ExportBuildFileGenerators.erase(it);
+    }
+}
+
 void cmMakefile::AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen)
 {
   this->ExportBuildFileGenerators.push_back(gen);
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8f865a0..8fe0bda 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -779,6 +779,7 @@ public:
 
   std::vector<cmExportBuildFileGenerator*>
   GetExportBuildFileGenerators() const;
+  void RemoveExportBuildFileGeneratorCMP0024(cmExportBuildFileGenerator* gen);
   void AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen);
 
 protected:

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |   16 +++++++++++++---
 Source/cmGlobalGenerator.h   |    4 ++--
 Source/cmMakefile.cxx        |   12 ++++++++++++
 Source/cmMakefile.h          |    1 +
 4 files changed, 28 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake