[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1734-g85fbd4d

[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  85fbd4d4647774d396830eb6fe8337034ad40564 (commit)
       via  936e00b92c9afe2be6b91d65166ade8ec1e06f48 (commit)
      from  f3c55a83742f10cd1fdb2bb17a255bd63c1329ce (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=85fbd4d4647774d396830eb6fe8337034ad40564
commit 85fbd4d4647774d396830eb6fe8337034ad40564
Merge: f3c55a8 936e00b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 2 06:33:36 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 2 06:33:36 2014 -0400

    Merge topic 'simplify-multi-config' into next
    
    936e00b9 Simplify multiple config handling.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=936e00b92c9afe2be6b91d65166ade8ec1e06f48
commit 936e00b92c9afe2be6b91d65166ade8ec1e06f48
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 27 09:46:58 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 2 12:29:33 2014 +0200

    Simplify multiple config handling.
    
    Use conventional pattern of not repeating the loop body for empty
    config.

diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index dcb77ba..2536ada 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -223,18 +223,15 @@ bool cmExportCommand
   // Compute the set of configurations exported.
   std::vector<std::string> configurationTypes;
   this->Makefile->GetConfigurations(configurationTypes);
-  if(!configurationTypes.empty())
+  if(configurationTypes.empty())
     {
-    for(std::vector<std::string>::const_iterator
-          ci = configurationTypes.begin();
-        ci != configurationTypes.end(); ++ci)
-      {
-      ebfg->AddConfiguration(*ci);
-      }
+    configurationTypes.push_back("");
     }
-  else
+  for(std::vector<std::string>::const_iterator
+        ci = configurationTypes.begin();
+      ci != configurationTypes.end(); ++ci)
     {
-    ebfg->AddConfiguration("");
+    ebfg->AddConfiguration(*ci);
     }
   if (this->ExportSet)
     {
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index d41285d..95a946a 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -135,18 +135,15 @@ void cmGeneratorExpressionEvaluationFile::Generate()
 
   if (allConfigs.empty())
     {
-    this->Generate("", inputExpression.get(), outputFiles);
+    allConfigs.push_back("");
     }
-  else
+  for(std::vector<std::string>::const_iterator li = allConfigs.begin();
+      li != allConfigs.end(); ++li)
     {
-    for(std::vector<std::string>::const_iterator li = allConfigs.begin();
-        li != allConfigs.end(); ++li)
+    this->Generate(*li, inputExpression.get(), outputFiles);
+    if(cmSystemTools::GetFatalErrorOccured())
       {
-      this->Generate(*li, inputExpression.get(), outputFiles);
-      if(cmSystemTools::GetFatalErrorOccured())
-        {
-        return;
-        }
+      return;
       }
     }
 }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c47147c..9cafed1 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -542,6 +542,10 @@ void cmLocalGenerator::GenerateTargetManifest()
   // Collect the set of configuration types.
   std::vector<std::string> configNames;
   this->Makefile->GetConfigurations(configNames);
+  if(configNames.empty())
+    {
+    configNames.push_back("");
+    }
 
   // Add our targets to the manifest for each configuration.
   cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
@@ -557,18 +561,11 @@ void cmLocalGenerator::GenerateTargetManifest()
       {
       continue;
       }
-    if(configNames.empty())
+    for(std::vector<std::string>::iterator ci = configNames.begin();
+        ci != configNames.end(); ++ci)
       {
-      target.GenerateTargetManifest("");
-      }
-    else
-      {
-      for(std::vector<std::string>::iterator ci = configNames.begin();
-          ci != configNames.end(); ++ci)
-        {
-        const char* config = ci->c_str();
-        target.GenerateTargetManifest(config);
-        }
+      const char* config = ci->c_str();
+      target.GenerateTargetManifest(config);
       }
     }
 }

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

Summary of changes:
 Source/cmExportCommand.cxx                     |   15 ++++++---------
 Source/cmGeneratorExpressionEvaluationFile.cxx |   15 ++++++---------
 Source/cmLocalGenerator.cxx                    |   19 ++++++++-----------
 3 files changed, 20 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
CMake