diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 806d27d86..98150dfa5 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/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, diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 39c977209..cf8c18fa6 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -229,6 +229,9 @@ public: void GetObjectLibrariesCMP0026(std::vector& objlibs) const; + std::string GetFullNameImported(const std::string& config, + bool implib) const; + bool GetConfigCommonSourceFiles(std::vector& files) const; bool HaveBuildTreeRPATH(const std::string& config) const; diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index a7372e3ba..bd011409a 100644 --- a/Source/cmTarget.cxx +++ b/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 diff --git a/Source/cmTarget.h b/Source/cmTarget.h index dda6e6a58..a2846df0c 100644 --- a/Source/cmTarget.h +++ b/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;