From 400e3d19fcebf7d6e9551d585d60754bd937c28c Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sun, 18 Oct 2015 16:33:48 +0200
Subject: cmLocalGenerator: Don't store imported generator targets

No consumers need them.  This makes GetGeneratorTargets more comparable
to cmMakefile::GetTargets, which does not include imported targets.
---
 Source/cmExtraEclipseCDT4Generator.cxx    |  4 ----
 Source/cmGlobalGenerator.cxx              |  1 -
 Source/cmGlobalUnixMakefileGenerator3.cxx | 12 ------------
 Source/cmLocalGenerator.cxx               |  7 +------
 Source/cmLocalGhsMultiGenerator.cxx       |  3 +--
 Source/cmLocalNinjaGenerator.cxx          |  3 +--
 Source/cmLocalUnixMakefileGenerator3.cxx  |  8 +-------
 7 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 236fb7d..31c05fd 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -969,10 +969,6 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
     for (cmGeneratorTargetsType::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
-      if (l->first->IsImported())
-        {
-        continue;
-        }
       std::vector<std::string> includeDirs;
       std::string config = mf->GetSafeDefinition("CMAKE_BUILD_TYPE");
       (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config);
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1142ddd..aecae35 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1595,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     {
     cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
     this->GeneratorTargets[*j] = gt;
-    generatorTargets[*j] = gt;
     }
   lg->SetGeneratorTargets(generatorTargets);
 }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 8e671a3..44e3de6 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -473,10 +473,6 @@ cmGlobalUnixMakefileGenerator3
        (type == cmState::OBJECT_LIBRARY) ||
        (type == cmState::UTILITY))
       {
-      if(gtarget->IsImported())
-        {
-        continue;
-        }
       // Add this to the list of depends rules in this directory.
       if((!check_all || !gtarget->GetPropertyAsBool("EXCLUDE_FROM_ALL")) &&
          (!check_relink ||
@@ -632,10 +628,6 @@ cmGlobalUnixMakefileGenerator3
         t != targets.end(); ++t)
       {
       cmGeneratorTarget* gtarget = t->second;
-      if(gtarget->IsImported())
-        {
-        continue;
-        }
       // Don't emit the same rule twice (e.g. two targets with the same
       // simple name)
       int type = gtarget->GetType();
@@ -733,10 +725,6 @@ cmGlobalUnixMakefileGenerator3
       t != targets.end(); ++t)
     {
     cmGeneratorTarget* gtarget = t->second;
-    if(gtarget->IsImported())
-      {
-      continue;
-      }
     int type = gtarget->GetType();
     std::string name = gtarget->GetName();
     if (!name.empty()
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9d5dd8e..1a4516c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -136,8 +136,7 @@ void cmLocalGenerator::TraceDependencies()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->Target->IsImported()
-        || t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -476,10 +475,6 @@ void cmLocalGenerator::ComputeTargetManifest()
       {
       continue;
       }
-    if (target.IsImported())
-      {
-      continue;
-      }
     for(std::vector<std::string>::iterator ci = configNames.begin();
         ci != configNames.end(); ++ci)
       {
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index a408a23..869ba2c 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -31,8 +31,7 @@ void cmLocalGhsMultiGenerator::Generate()
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
     {
-    if (l->second->GetType() == cmState::INTERFACE_LIBRARY
-        || l->second->IsImported())
+    if (l->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 4da77e0..756c139 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -77,8 +77,7 @@ void cmLocalNinjaGenerator::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY
-        || t->second->Target->IsImported())
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index add0aa9..5485da4 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -119,8 +119,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY
-        || t->second->Target->IsImported())
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -430,11 +429,6 @@ void cmLocalUnixMakefileGenerator3
        (t->second->GetType() == cmState::OBJECT_LIBRARY) ||
        (t->second->GetType() == cmState::UTILITY))
       {
-      if (t->second->Target->IsImported())
-        {
-        continue;
-        }
-
       emitted.insert(t->second->GetName());
 
       // for subdirs add a rule to build this specific target by name.
-- 
cgit v0.12