[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6683-g725f3e2

[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  725f3e23bafbfad00b49ea25a1e2601e90a4589c (commit)
       via  337d2dfb3299c55af7bb3acb1614005f2a8f954a (commit)
      from  f848321a280f4dff96e2b11eb5aa3f2ac6ba5ae8 (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=725f3e23bafbfad00b49ea25a1e2601e90a4589c
commit 725f3e23bafbfad00b49ea25a1e2601e90a4589c
Merge: f848321 337d2df
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 4 08:41:14 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 4 08:41:14 2014 -0500

    Merge topic 'minor-cleanups' into next
    
    337d2df Fix bootstrap.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=337d2dfb3299c55af7bb3acb1614005f2a8f954a
commit 337d2dfb3299c55af7bb3acb1614005f2a8f954a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 4 14:38:26 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jan 4 14:39:38 2014 +0100

    Fix bootstrap.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index f548c50..b669cd1 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -164,12 +164,6 @@ void cmExportBuildFileGenerator::SetExportSet(cmExportSet *exportSet)
 }
 
 //----------------------------------------------------------------------------
-cmExportSet* cmExportBuildFileGenerator::GetExportSet() const
-{
-  return this->ExportSet;
-}
-
-//----------------------------------------------------------------------------
 void
 cmExportBuildFileGenerator
 ::SetImportLocationProperty(const char* config, std::string const& suffix,
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index cd11678..cea2099 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -39,7 +39,6 @@ public:
     { this->Targets.insert(this->Targets.end(),
       targets.begin(), targets.end()); }
   void SetExportSet(cmExportSet*);
-  cmExportSet* GetExportSet() const;
 
   /** Set whether to append generated code to the output file.  */
   void SetAppendMode(bool append) { this->AppendMode = append; }
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index b6bf870..7c97d8d 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -236,8 +236,14 @@ bool cmExportCommand
     {
     ebfg->AddConfiguration("");
     }
-
-  gg->AddBuildExportSet(ebfg);
+  if (this->ExportSet)
+    {
+    gg->AddBuildExportExportSet(ebfg);
+    }
+  else
+    {
+    gg->AddBuildExportSet(ebfg);
+    }
 
   return true;
 }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3736fde..eef8d6d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -187,6 +187,13 @@ void cmGlobalGenerator::AddBuildExportSet(cmExportBuildFileGenerator* gen)
   this->BuildExportSets[gen->GetMainExportFileName()] = gen;
 }
 
+void
+cmGlobalGenerator::AddBuildExportExportSet(cmExportBuildFileGenerator* gen)
+{
+  this->BuildExportSets[gen->GetMainExportFileName()] = gen;
+  this->BuildExportExportSets[gen->GetMainExportFileName()] = gen;
+}
+
 bool cmGlobalGenerator::GenerateImportFile(const std::string &file)
 {
   std::map<std::string, cmExportBuildFileGenerator*>::iterator it
@@ -211,7 +218,8 @@ cmGlobalGenerator::IsExportedTargetsFile(const std::string &filename) const
     {
     return false;
     }
-  return it->second->GetExportSet() ? false : true;
+  return this->BuildExportExportSets.find(filename)
+                                        == this->BuildExportExportSets.end();
 }
 
 // Find the make program for the generator, required for try compiles
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 049b0e6..fc5cab9 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -311,6 +311,7 @@ public:
   std::map<std::string, cmExportBuildFileGenerator*>& GetBuildExportSets()
     {return this->BuildExportSets;}
   void AddBuildExportSet(cmExportBuildFileGenerator*);
+  void AddBuildExportExportSet(cmExportBuildFileGenerator*);
   bool IsExportedTargetsFile(const std::string &filename) const;
   bool GenerateImportFile(const std::string &file);
   cmExportBuildFileGenerator*
@@ -375,6 +376,7 @@ protected:
   // Sets of named target exports
   cmExportSetMap ExportSets;
   std::map<std::string, cmExportBuildFileGenerator*> BuildExportSets;
+  std::map<std::string, cmExportBuildFileGenerator*> BuildExportExportSets;
 
   // Manifest of all targets that will be built for each configuration.
   // This is computed just before local generators generate.

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

Summary of changes:
 Source/cmExportBuildFileGenerator.cxx |    6 ------
 Source/cmExportBuildFileGenerator.h   |    1 -
 Source/cmExportCommand.cxx            |   10 ++++++++--
 Source/cmGlobalGenerator.cxx          |   10 +++++++++-
 Source/cmGlobalGenerator.h            |    2 ++
 5 files changed, 19 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake