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

cmTarget: Drop 'head' argument from ComputeLinkImplementationLanguages

Browse Source 
No call sites need it to be anything but 'this'.
This commit is contained in:
Brad King 2014-07-10 16:02:46 -04:00
parent c72642f927
commit 190cabe7c1
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmTarget.cxx
View File

@ -6405,7 +6405,7 @@ cmTarget::GetLinkImplementation(const std::string& config) const
if(!impl.LanguagesDone) if(!impl.LanguagesDone)
{ {
impl.LanguagesDone = true; impl.LanguagesDone = true;
this->ComputeLinkImplementationLanguages(config, impl, this); this->ComputeLinkImplementationLanguages(config, impl);
} }
return &impl; return &impl;
} }
@ -6546,13 +6546,12 @@ void cmTarget::ComputeLinkImplementation(const std::string& config,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
cmTarget::ComputeLinkImplementationLanguages(const std::string& config, cmTarget::ComputeLinkImplementationLanguages(const std::string& config,
LinkImplementation& impl, LinkImplementation& impl) const
cmTarget const* head) const
{ {
// This target needs runtime libraries for its source languages. // This target needs runtime libraries for its source languages.
std::set<std::string> languages; std::set<std::string> languages;
// Get languages used in our source files. // Get languages used in our source files.
this->GetLanguages(languages, config, head); this->GetLanguages(languages, config, this);
// Copy the set of langauges to the link implementation. // Copy the set of langauges to the link implementation.
for(std::set<std::string>::iterator li = languages.begin(); for(std::set<std::string>::iterator li = languages.begin();
li != languages.end(); ++li) li != languages.end(); ++li)

3
Source/cmTarget.h
View File

@ -787,8 +787,7 @@ private:
LinkImplementation& impl, LinkImplementation& impl,
cmTarget const* head) const; cmTarget const* head) const;
void ComputeLinkImplementationLanguages(const std::string& config, void ComputeLinkImplementationLanguages(const std::string& config,
LinkImplementation& impl, LinkImplementation& impl) const;
cmTarget const* head) const;
void ComputeLinkClosure(const std::string& config, LinkClosure& lc) const; void ComputeLinkClosure(const std::string& config, LinkClosure& lc) const;
void ExpandLinkItems(std::string const& prop, std::string const& value, void ExpandLinkItems(std::string const& prop, std::string const& value,