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

cmComputeTargetDepends: Remove unused 'linking' argument

Browse Source 
The AddInterfaceDepends method is never called with a non-true value for
its 'linking' argument.  Drop it.
This commit is contained in:
Brad King 2014-06-16 09:49:13 -04:00
parent 8d15a1bbfb
commit 7b85938973
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmComputeTargetDepends.cxx
View File

@ -261,8 +261,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
if(emitted.insert(*lib).second) if(emitted.insert(*lib).second)
{ {
this->AddTargetDepend(depender_index, *lib, true); this->AddTargetDepend(depender_index, *lib, true);
this->AddInterfaceDepends(depender_index, *lib, this->AddInterfaceDepends(depender_index, *lib, emitted);
true, emitted);
} }
} }
} }
@ -304,8 +303,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
if(emitted.insert(*lib).second) if(emitted.insert(*lib).second)
{ {
this->AddTargetDepend(depender_index, *lib, true); this->AddTargetDepend(depender_index, *lib, true);
this->AddInterfaceDepends(depender_index, *lib, this->AddInterfaceDepends(depender_index, *lib, emitted);
true, emitted);
} }
} }
} }
@ -314,7 +312,6 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmComputeTargetDepends::AddInterfaceDepends(int depender_index, void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
const std::string& dependee_name, const std::string& dependee_name,
bool linking,
std::set<std::string> &emitted) std::set<std::string> &emitted)
{ {
cmTarget const* depender = this->Targets[depender_index]; cmTarget const* depender = this->Targets[depender_index];
@ -323,7 +320,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
// Skip targets that will not really be linked. This is probably a // Skip targets that will not really be linked. This is probably a
// name conflict between an external library and an executable // name conflict between an external library and an executable
// within the project. // within the project.
if(linking && dependee && if(dependee &&
dependee->GetType() == cmTarget::EXECUTABLE && dependee->GetType() == cmTarget::EXECUTABLE &&
!dependee->IsExecutableWithExports()) !dependee->IsExecutableWithExports())
{ {

2
Source/cmComputeTargetDepends.h
View File

@ -53,7 +53,7 @@ private:
bool ComputeFinalDepends(cmComputeComponentGraph const& ccg); bool ComputeFinalDepends(cmComputeComponentGraph const& ccg);
void AddInterfaceDepends(int depender_index, void AddInterfaceDepends(int depender_index,
const std::string& dependee_name, const std::string& dependee_name,
bool linking, std::set<std::string> &emitted); std::set<std::string> &emitted);
void AddInterfaceDepends(int depender_index, cmTarget const* dependee, void AddInterfaceDepends(int depender_index, cmTarget const* dependee,
const std::string& config, const std::string& config,
std::set<std::string> &emitted); std::set<std::string> &emitted);