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

cmGeneratorTarget: Move GetFullNameComponents from cmTarget.

Browse Source
This commit is contained in:
Stephen Kelly 2015-08-04 19:19:47 +02:00
parent e27d737e27
commit 62720e44be
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGeneratorTarget.cxx
View File

@ -890,6 +890,16 @@ std::string cmGeneratorTarget::GetSOName(const std::string& config) const
} }
} }
//----------------------------------------------------------------------------
void cmGeneratorTarget::GetFullNameComponents(std::string& prefix,
std::string& base,
std::string& suffix,
const std::string& config,
bool implib) const
{
this->Target->GetFullNameInternal(config, implib, prefix, base, suffix);
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmGeneratorTarget::GetModuleDefinitionFile(const std::string& config) const cmGeneratorTarget::GetModuleDefinitionFile(const std::string& config) const

5
Source/cmGeneratorTarget.h
View File

@ -118,6 +118,11 @@ public:
/** Get the soname of the target. Allowed only for a shared library. */ /** Get the soname of the target. Allowed only for a shared library. */
std::string GetSOName(const std::string& config) const; std::string GetSOName(const std::string& config) const;
void GetFullNameComponents(std::string& prefix,
std::string& base, std::string& suffix,
const std::string& config="",
bool implib = false) const;
cmTarget* Target; cmTarget* Target;
cmMakefile* Makefile; cmMakefile* Makefile;
cmLocalGenerator* LocalGenerator; cmLocalGenerator* LocalGenerator;

2
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1940,7 +1940,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
std::string pnprefix; std::string pnprefix;
std::string pnbase; std::string pnbase;
std::string pnsuffix; std::string pnsuffix;
target.GetFullNameComponents(pnprefix, pnbase, pnsuffix, configName); gtgt->GetFullNameComponents(pnprefix, pnbase, pnsuffix, configName);
const char* version = target.GetProperty("VERSION"); const char* version = target.GetProperty("VERSION");
const char* soversion = target.GetProperty("SOVERSION"); const char* soversion = target.GetProperty("SOVERSION");

2
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -569,7 +569,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
std::string prefix; std::string prefix;
std::string base; std::string base;
std::string suffix; std::string suffix;
target.GetFullNameComponents(prefix, base, suffix); this->GetGeneratorTarget()->GetFullNameComponents(prefix, base, suffix);
std::string dbg_suffix = ".dbg"; std::string dbg_suffix = ".dbg";
// TODO: Where to document? // TODO: Where to document?
if (mf->GetDefinition("CMAKE_DEBUG_SYMBOL_SUFFIX")) if (mf->GetDefinition("CMAKE_DEBUG_SYMBOL_SUFFIX"))

9
Source/cmTarget.cxx
View File

@ -3608,15 +3608,6 @@ cmTarget::GetFullNameImported(const std::string& config, bool implib) const
this->ImportedGetFullPath(config, implib)); this->ImportedGetFullPath(config, implib));
} }
//----------------------------------------------------------------------------
void cmTarget::GetFullNameComponents(std::string& prefix, std::string& base,
std::string& suffix,
const std::string& config,
bool implib) const
{
this->GetFullNameInternal(config, implib, prefix, base, suffix);
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmTarget::ImportedGetFullPath(const std::string& config, bool implib) const cmTarget::ImportedGetFullPath(const std::string& config, bool implib) const

4
Source/cmTarget.h
View File

@ -372,10 +372,6 @@ public:
makefile. */ makefile. */
std::string GetFullName(const std::string& config="", std::string GetFullName(const std::string& config="",
bool implib = false) const; bool implib = false) const;
void GetFullNameComponents(std::string& prefix,
std::string& base, std::string& suffix,
const std::string& config="",
bool implib = false) const;
/** Whether this library has \@rpath and platform supports it. */ /** Whether this library has \@rpath and platform supports it. */
bool HasMacOSXRpathInstallNameDir(const std::string& config) const; bool HasMacOSXRpathInstallNameDir(const std::string& config) const;