Selaa lähdekoodia

cmTarget: Drop GetTransitivePropertyTargets method

Inline the implementation at the only remaining call site.
Brad King 11 vuotta sitten
vanhempi
sitoutus
0a8fbac19a
3 muutettua tiedostoa jossa 13 lisäystä ja 25 poistoa
  1. 13 3
      Source/cmGeneratorExpressionEvaluator.cxx
  2. 0 19
      Source/cmTarget.cxx
  3. 0 3
      Source/cmTarget.h

+ 13 - 3
Source/cmGeneratorExpressionEvaluator.cxx

@@ -1098,10 +1098,20 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if (std::find_if(transBegin, transEnd,
                      cmStrCmp(propertyName)) != transEnd)
       {
-
       std::vector<cmTarget const*> tgts;
-      target->GetTransitivePropertyTargets(context->Config,
-                                                 headTarget, tgts);
+      if(cmTarget::LinkInterfaceLibraries const* iface =
+         target->GetLinkInterfaceLibraries(context->Config, headTarget, true))
+        {
+        for(std::vector<cmLinkItem>::const_iterator
+              it = iface->Libraries.begin();
+            it != iface->Libraries.end(); ++it)
+          {
+          if (it->Target)
+            {
+            tgts.push_back(it->Target);
+            }
+          }
+        }
       if (!tgts.empty())
         {
         linkedTargetsContent =

+ 0 - 19
Source/cmTarget.cxx

@@ -6054,25 +6054,6 @@ cmTarget::GetLinkImplementationClosure(const std::string& config) const
   return tgts;
 }
 
-//----------------------------------------------------------------------------
-void cmTarget::GetTransitivePropertyTargets(const std::string& config,
-                                      cmTarget const* headTarget,
-                                      std::vector<cmTarget const*> &tgts) const
-{
-  if(cmTarget::LinkInterfaceLibraries const* iface =
-     this->GetLinkInterfaceLibraries(config, headTarget, true))
-    {
-    for(std::vector<cmLinkItem>::const_iterator it = iface->Libraries.begin();
-        it != iface->Libraries.end(); ++it)
-      {
-      if (it->Target)
-        {
-        tgts.push_back(it->Target);
-        }
-      }
-    }
-}
-
 //----------------------------------------------------------------------------
 void
 cmTargetInternals::ComputeLinkInterfaceLibraries(

+ 0 - 3
Source/cmTarget.h

@@ -296,9 +296,6 @@ public:
     GetLinkInterfaceLibraries(const std::string& config,
                               cmTarget const* headTarget,
                               bool usage_requirements_only) const;
-  void GetTransitivePropertyTargets(const std::string& config,
-                                    cmTarget const* headTarget,
-                                    std::vector<cmTarget const*> &libs) const;
 
   std::vector<cmTarget const*> const&
     GetLinkImplementationClosure(const std::string& config) const;