diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-16 17:19:50 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-16 18:24:43 (GMT) |
| commit | cb8c728f17a61732064280ddb98203cb277e5a3c (patch) | |
| tree | 36b6874789b7af34c447a9556c73f8519692c4f8 | |
| parent | fb4fca0b5efabdf061bd256ed9d35edae6f42b9d (diff) | |
| download | CMake-cb8c728f17a61732064280ddb98203cb277e5a3c.zip CMake-cb8c728f17a61732064280ddb98203cb277e5a3c.tar.gz CMake-cb8c728f17a61732064280ddb98203cb277e5a3c.tar.bz2 | |
cmGeneratorTarget: Move GetFullNameImported from cmTarget.
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 10 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 3 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 8 | ||||
| -rw-r--r-- | Source/cmTarget.h | 3 |
4 files changed, 12 insertions, 12 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 806d27d..98150df 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 { @@ -3344,6 +3344,14 @@ std::string cmGeneratorTarget::GetFullNameInternal(const std::string& config, } //---------------------------------------------------------------------------- +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, std::string& outPrefix, diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 39c9772..cf8c18f 100644 --- a/Source/cmGeneratorTarget.h +++ b/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; diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index a7372e3..bd01140 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2100,14 +2100,6 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const //---------------------------------------------------------------------------- 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 { std::string result; diff --git a/Source/cmTarget.h b/Source/cmTarget.h index dda6e6a..a2846df 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; |