1 files changed, 42 insertions, 61 deletions

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 891af84675..5a826f2ba6 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -18,9 +18,8 @@
 #include "cmLocalGenerator.h"
 
 cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
-    cmGlobalGenerator* gg,
-    const std::vector<std::string>& targets,
-    cmMakefile* mf)
+  cmGlobalGenerator* gg, const std::vector<std::string>& targets,
+  cmMakefile* mf)
 {
   gg->CreateImportedGenerationObjects(mf, targets, this->Exports);
 }
@@ -29,19 +28,17 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
 {
   std::set<cmGeneratorTarget const*> emitted;
   std::set<cmGeneratorTarget const*> emittedDeps;
-  while(!this->Exports.empty())
-    {
+  while (!this->Exports.empty()) {
     cmGeneratorTarget const* te = this->Exports.back();
     this->Exports.pop_back();
-    if (emitted.insert(te).second)
-      {
+    if (emitted.insert(te).second) {
       emittedDeps.insert(te);
       this->GenerateImportTargetCode(os, te);
 
       ImportPropertyMap properties;
 
-#define FIND_TARGETS(PROPERTY) \
-      this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
+#define FIND_TARGETS(PROPERTY)                                                \
+  this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
 
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
 
@@ -50,27 +47,23 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
       this->PopulateProperties(te, properties, emittedDeps);
 
       this->GenerateInterfaceProperties(te, os, properties);
-      }
     }
+  }
   return true;
 }
 
 std::string cmExportTryCompileFileGenerator::FindTargets(
-                                  const std::string& propName,
-                                  cmGeneratorTarget const* tgt,
-                                  std::set<cmGeneratorTarget const*> &emitted)
+  const std::string& propName, cmGeneratorTarget const* tgt,
+  std::set<cmGeneratorTarget const*>& emitted)
 {
-  const char *prop = tgt->GetProperty(propName);
-  if(!prop)
-    {
+  const char* prop = tgt->GetProperty(propName);
+  if (!prop) {
     return std::string();
-    }
+  }
 
   cmGeneratorExpression ge;
 
-  cmGeneratorExpressionDAGChecker dagChecker(
-                                      tgt->GetName(),
-                                      propName, 0, 0);
+  cmGeneratorExpressionDAGChecker dagChecker(tgt->GetName(), propName, 0, 0);
 
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(prop);
 
@@ -81,70 +74,58 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
   cmGeneratorTarget gDummyHead(&dummyHead, tgt->GetLocalGenerator());
 
   std::string result = cge->Evaluate(tgt->GetLocalGenerator(), this->Config,
-                                     false, &gDummyHead,
-                                     tgt, &dagChecker);
-
-  const std::set<cmGeneratorTarget const*> &allTargets =
-      cge->GetAllTargetsSeen();
-  for(std::set<cmGeneratorTarget const*>::const_iterator li =
-      allTargets.begin(); li != allTargets.end(); ++li)
-    {
-    if(emitted.insert(*li).second)
-      {
+                                     false, &gDummyHead, tgt, &dagChecker);
+
+  const std::set<cmGeneratorTarget const*>& allTargets =
+    cge->GetAllTargetsSeen();
+  for (std::set<cmGeneratorTarget const*>::const_iterator li =
+         allTargets.begin();
+       li != allTargets.end(); ++li) {
+    if (emitted.insert(*li).second) {
       this->Exports.push_back(*li);
-      }
     }
+  }
   return result;
 }
 
-void
-cmExportTryCompileFileGenerator::PopulateProperties(
-                                 const cmGeneratorTarget* target,
-                                 ImportPropertyMap& properties,
-                                 std::set<cmGeneratorTarget const*> &emitted)
+void cmExportTryCompileFileGenerator::PopulateProperties(
+  const cmGeneratorTarget* target, ImportPropertyMap& properties,
+  std::set<cmGeneratorTarget const*>& emitted)
 {
   std::vector<std::string> props = target->GetPropertyKeys();
-  for(std::vector<std::string>::const_iterator i = props.begin();
-      i != props.end(); ++i)
-    {
+  for (std::vector<std::string>::const_iterator i = props.begin();
+       i != props.end(); ++i) {
 
     properties[*i] = target->GetProperty(*i);
 
-    if(i->find("IMPORTED_LINK_INTERFACE_LIBRARIES") == 0
-        || i->find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0
-        || i->find("INTERFACE_LINK_LIBRARIES") == 0)
-      {
-      std::string evalResult = this->FindTargets(*i,
-                                                 target, emitted);
+    if (i->find("IMPORTED_LINK_INTERFACE_LIBRARIES") == 0 ||
+        i->find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0 ||
+        i->find("INTERFACE_LINK_LIBRARIES") == 0) {
+      std::string evalResult = this->FindTargets(*i, target, emitted);
 
       std::vector<std::string> depends;
       cmSystemTools::ExpandListArgument(evalResult, depends);
-      for(std::vector<std::string>::const_iterator li = depends.begin();
-          li != depends.end(); ++li)
-        {
-        cmGeneratorTarget *tgt =
-            target->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
-        if(tgt && emitted.insert(tgt).second)
-          {
+      for (std::vector<std::string>::const_iterator li = depends.begin();
+           li != depends.end(); ++li) {
+        cmGeneratorTarget* tgt =
+          target->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
+        if (tgt && emitted.insert(tgt).second) {
           this->Exports.push_back(tgt);
-          }
         }
       }
     }
+  }
 }
 
-std::string
-cmExportTryCompileFileGenerator::InstallNameDir(cmGeneratorTarget* target,
-                                                const std::string& config)
+std::string cmExportTryCompileFileGenerator::InstallNameDir(
+  cmGeneratorTarget* target, const std::string& config)
 {
   std::string install_name_dir;
 
   cmMakefile* mf = target->Target->GetMakefile();
-  if(mf->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
-    {
-    install_name_dir =
-      target->GetInstallNameDirForBuildTree(config);
-    }
+  if (mf->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) {
+    install_name_dir = target->GetInstallNameDirForBuildTree(config);
+  }
 
   return install_name_dir;
 }