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

cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget.

This commit is contained in:
Stephen Kelly 2015-09-16 05:04:51 +02:00
parent 1988255448
commit 83c29e3903
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGeneratorTarget.cxx
View File

@ -5111,7 +5111,7 @@ cmGeneratorTarget::GetLinkImplementation(const std::string& config) const
if(!impl.LibrariesDone) if(!impl.LibrariesDone)
{ {
impl.LibrariesDone = true; impl.LibrariesDone = true;
this->ComputeLinkImplementationLibraries(config, impl, this->Target); this->ComputeLinkImplementationLibraries(config, impl, this);
} }
if(!impl.LanguagesDone) if(!impl.LanguagesDone)
{ {
@ -5293,7 +5293,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
if(!impl.LibrariesDone) if(!impl.LibrariesDone)
{ {
impl.LibrariesDone = true; impl.LibrariesDone = true;
this->ComputeLinkImplementationLibraries(config, impl, head->Target); this->ComputeLinkImplementationLibraries(config, impl, head);
} }
return &impl; return &impl;
} }
@ -5310,7 +5310,7 @@ cmGeneratorTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
void cmGeneratorTarget::ComputeLinkImplementationLibraries( void cmGeneratorTarget::ComputeLinkImplementationLibraries(
const std::string& config, const std::string& config,
cmOptionalLinkImplementation& impl, cmOptionalLinkImplementation& impl,
cmTarget const* head) const cmGeneratorTarget const* head) const
{ {
cmStringRange entryRange = cmStringRange entryRange =
this->Target->GetLinkImplementationEntries(); this->Target->GetLinkImplementationEntries();
@ -5329,7 +5329,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge = cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
ge.Parse(*le); ge.Parse(*le);
std::string const evaluated = std::string const evaluated =
cge->Evaluate(this->Makefile, config, false, head, &dagChecker); cge->Evaluate(this->Makefile, config, false, head->Target, &dagChecker);
cmSystemTools::ExpandListArgument(evaluated, llibs); cmSystemTools::ExpandListArgument(evaluated, llibs);
if(cge->GetHadHeadSensitiveCondition()) if(cge->GetHadHeadSensitiveCondition())
{ {

2
Source/cmGeneratorTarget.h
View File

@ -212,7 +212,7 @@ public:
void ComputeLinkImplementationLibraries(const std::string& config, void ComputeLinkImplementationLibraries(const std::string& config,
cmOptionalLinkImplementation& impl, cmOptionalLinkImplementation& impl,
cmTarget const* head) const; const cmGeneratorTarget* head) const;
// Compute the set of languages compiled by the target. This is // Compute the set of languages compiled by the target. This is
// computed every time it is called because the languages can change // computed every time it is called because the languages can change