kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGeneratorTarget: Move GetFullNameImported from cmTarget.

This commit is contained in:
Stephen Kelly 2015-10-16 19:19:50 +02:00
parent fb4fca0b5e
commit cb8c728f17
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGeneratorTarget.cxx
View File

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

3
Source/cmGeneratorTarget.h
View File

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

8
Source/cmTarget.cxx
View File

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

3
Source/cmTarget.h
View File

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