[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1587-g16a0f54

[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  16a0f5453a29cc4ab9bf4dae16d3a0513db9bb78 (commit)
       via  e27e59e4f8d348cca25930cb3bab52ebee315765 (commit)
      from  2e09a8635e84aa712650ee3b383bc3cc6c06cd88 (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=16a0f5453a29cc4ab9bf4dae16d3a0513db9bb78
commit 16a0f5453a29cc4ab9bf4dae16d3a0513db9bb78
Merge: 2e09a86 e27e59e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Mar 30 09:27:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Mar 30 09:27:09 2014 -0400

    Merge topic 'target-transitive-sources' into next
    
    e27e59e4 Revert "Simplify multiple config handling."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e27e59e4f8d348cca25930cb3bab52ebee315765
commit e27e59e4f8d348cca25930cb3bab52ebee315765
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Mar 30 15:26:36 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Mar 30 15:26:36 2014 +0200

    Revert "Simplify multiple config handling."
    
    This reverts commit ff473f2f954401591455eb595e38f3d65964128e.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 2f5ae87..f07bccb 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -333,12 +333,9 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
 
   if(dependee)
     {
+    this->AddInterfaceDepends(depender_index, dependee, "", emitted);
     std::vector<std::string> configs;
     depender->GetMakefile()->GetConfigurations(configs);
-    if (configs.empty())
-      {
-      configs.push_back("");
-      }
     for (std::vector<std::string>::const_iterator it = configs.begin();
       it != configs.end(); ++it)
       {
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 2536ada..dcb77ba 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -223,15 +223,18 @@ bool cmExportCommand
   // Compute the set of configurations exported.
   std::vector<std::string> configurationTypes;
   this->Makefile->GetConfigurations(configurationTypes);
-  if(configurationTypes.empty())
+  if(!configurationTypes.empty())
     {
-    configurationTypes.push_back("");
+    for(std::vector<std::string>::const_iterator
+          ci = configurationTypes.begin();
+        ci != configurationTypes.end(); ++ci)
+      {
+      ebfg->AddConfiguration(*ci);
+      }
     }
-  for(std::vector<std::string>::const_iterator
-        ci = configurationTypes.begin();
-      ci != configurationTypes.end(); ++ci)
+  else
     {
-    ebfg->AddConfiguration(*ci);
+    ebfg->AddConfiguration("");
     }
   if (this->ExportSet)
     {
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index a81bd50..b38c48b 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -490,13 +490,11 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
 
   if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
     {
+    getCompatibleInterfaceProperties(target, ifaceProperties, "");
+
     std::vector<std::string> configNames;
     target->GetMakefile()->GetConfigurations(configNames);
 
-    if(configNames.empty())
-      {
-      configNames.push_back("");
-      }
     for (std::vector<std::string>::const_iterator ci = configNames.begin();
       ci != configNames.end(); ++ci)
       {
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 95a946a..d41285d 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -135,15 +135,18 @@ void cmGeneratorExpressionEvaluationFile::Generate()
 
   if (allConfigs.empty())
     {
-    allConfigs.push_back("");
+    this->Generate("", inputExpression.get(), outputFiles);
     }
-  for(std::vector<std::string>::const_iterator li = allConfigs.begin();
-      li != allConfigs.end(); ++li)
+  else
     {
-    this->Generate(*li, inputExpression.get(), outputFiles);
-    if(cmSystemTools::GetFatalErrorOccured())
+    for(std::vector<std::string>::const_iterator li = allConfigs.begin();
+        li != allConfigs.end(); ++li)
       {
-      return;
+      this->Generate(*li, inputExpression.get(), outputFiles);
+      if(cmSystemTools::GetFatalErrorOccured())
+        {
+        return;
+        }
       }
     }
 }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c840888..61d2a80 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -542,10 +542,6 @@ 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();
@@ -561,11 +557,18 @@ void cmLocalGenerator::GenerateTargetManifest()
       {
       continue;
       }
-    for(std::vector<std::string>::iterator ci = configNames.begin();
-        ci != configNames.end(); ++ci)
+    if(configNames.empty())
       {
-      const char* config = ci->c_str();
-      target.GenerateTargetManifest(config);
+      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);
+        }
       }
     }
 }

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

Summary of changes:
 Source/cmComputeTargetDepends.cxx              |    5 +----
 Source/cmExportCommand.cxx                     |   15 +++++++++------
 Source/cmExportFileGenerator.cxx               |    6 ++----
 Source/cmGeneratorExpressionEvaluationFile.cxx |   15 +++++++++------
 Source/cmLocalGenerator.cxx                    |   19 +++++++++++--------
 5 files changed, 32 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
CMake