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

cmTarget: Drop 'head' argument from GetLanguages 

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

9
Source/cmTarget.cxx
View File

@ -5419,11 +5419,10 @@ cmTarget::GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmTarget::GetLanguages(std::set<std::string>& languages, void cmTarget::GetLanguages(std::set<std::string>& languages,
const std::string& config, const std::string& config) const
cmTarget const* head) const
{ {
std::vector<cmSourceFile*> sourceFiles; std::vector<cmSourceFile*> sourceFiles;
this->GetSourceFiles(sourceFiles, config, head); this->GetSourceFiles(sourceFiles, config, this);
for(std::vector<cmSourceFile*>::const_iterator for(std::vector<cmSourceFile*>::const_iterator
i = sourceFiles.begin(); i != sourceFiles.end(); ++i) i = sourceFiles.begin(); i != sourceFiles.end(); ++i)
{ {
@ -5459,7 +5458,7 @@ void cmTarget::GetLanguages(std::set<std::string>& languages,
for(std::vector<cmTarget*>::const_iterator for(std::vector<cmTarget*>::const_iterator
i = objectLibraries.begin(); i != objectLibraries.end(); ++i) i = objectLibraries.begin(); i != objectLibraries.end(); ++i)
{ {
(*i)->GetLanguages(languages, config, head); (*i)->GetLanguages(languages, config);
} }
} }
@ -6551,7 +6550,7 @@ cmTarget::ComputeLinkImplementationLanguages(const std::string& config,
// 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, this); this->GetLanguages(languages, config);
// 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

@ -491,8 +491,7 @@ public:
// information to forward these property changes to the targets // information to forward these property changes to the targets
// until we have per-target object file properties. // until we have per-target object file properties.
void GetLanguages(std::set<std::string>& languages, void GetLanguages(std::set<std::string>& languages,
std::string const& config, std::string const& config) const;
cmTarget const* head = 0) const;
/** Return whether this target is an executable with symbol exports /** Return whether this target is an executable with symbol exports
enabled. */ enabled. */