Pārlūkot izejas kodu

cmGeneratorTarget: Move GetFullNameImported from cmTarget.

Stephen Kelly 10 gadi atpakaļ
vecāks
revīzija
cb8c728f17
4 mainītis faili ar 12 papildinājumiem un 12 dzēšanām
  1. 9 1
      Source/cmGeneratorTarget.cxx
  2. 3 0
      Source/cmGeneratorTarget.h
  3. 0 8
      Source/cmTarget.cxx
  4. 0 3
      Source/cmTarget.h

+ 9 - 1
Source/cmGeneratorTarget.cxx

@@ -1605,7 +1605,7 @@ cmGeneratorTarget::GetFullName(const std::string& config, bool implib) const
 {
   if(this->Target->IsImported())
     {
-    return this->Target->GetFullNameImported(config, implib);
+    return this->GetFullNameImported(config, implib);
     }
   else
     {
@@ -3343,6 +3343,14 @@ std::string cmGeneratorTarget::GetFullNameInternal(const std::string& config,
   return prefix+base+suffix;
 }
 
+//----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetFullNameImported(const std::string& config,
+                                                   bool implib) const
+{
+  return cmSystemTools::GetFilenameName(
+    this->Target->ImportedGetFullPath(config, implib));
+}
+
 //----------------------------------------------------------------------------
 void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
                                             bool implib,

+ 3 - 0
Source/cmGeneratorTarget.h

@@ -229,6 +229,9 @@ public:
   void
   GetObjectLibrariesCMP0026(std::vector<cmGeneratorTarget*>& objlibs) const;
 
+  std::string GetFullNameImported(const std::string& config,
+                                  bool implib) const;
+
   bool GetConfigCommonSourceFiles(std::vector<cmSourceFile*>& files) const;
 
   bool HaveBuildTreeRPATH(const std::string& config) const;

+ 0 - 8
Source/cmTarget.cxx

@@ -2098,14 +2098,6 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
   return "";
 }
 
-//----------------------------------------------------------------------------
-std::string
-cmTarget::GetFullNameImported(const std::string& config, bool implib) const
-{
-  return cmSystemTools::GetFilenameName(
-    this->ImportedGetFullPath(config, implib));
-}
-
 //----------------------------------------------------------------------------
 std::string
 cmTarget::ImportedGetFullPath(const std::string& config, bool implib) const

+ 0 - 3
Source/cmTarget.h

@@ -383,9 +383,6 @@ private:
   void SetPropertyDefault(const std::string& property,
                           const char* default_value);
 
-  std::string GetFullNameImported(const std::string& config,
-                                  bool implib) const;
-
   std::string ImportedGetFullPath(const std::string& config,
                                   bool implib) const;