diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-16 13:49:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-06-23 12:50:08 (GMT) |
| commit | 7b85938973782ec6d09b1debe6ad48d3ba887683 (patch) | |
| tree | 27be36a8644409a2d8bbc7d5a30f5a4652d264a8 | |
| parent | 8d15a1bbfbefff919d8a7aa0d04f54d08d1f1a11 (diff) | |
| download | CMake-7b85938973782ec6d09b1debe6ad48d3ba887683.zip CMake-7b85938973782ec6d09b1debe6ad48d3ba887683.tar.gz CMake-7b85938973782ec6d09b1debe6ad48d3ba887683.tar.bz2 | |
cmComputeTargetDepends: Remove unused 'linking' argument
The AddInterfaceDepends method is never called with a non-true value for
its 'linking' argument. Drop it.
| -rw-r--r-- | Source/cmComputeTargetDepends.cxx | 9 | ||||
| -rw-r--r-- | Source/cmComputeTargetDepends.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx index f28217f..8e75807 100644 --- a/Source/cmComputeTargetDepends.cxx +++ b/Source/cmComputeTargetDepends.cxx @@ -261,8 +261,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index) if(emitted.insert(*lib).second) { this->AddTargetDepend(depender_index, *lib, true); - this->AddInterfaceDepends(depender_index, *lib, - true, emitted); + this->AddInterfaceDepends(depender_index, *lib, emitted); } } } @@ -304,8 +303,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index, if(emitted.insert(*lib).second) { this->AddTargetDepend(depender_index, *lib, true); - this->AddInterfaceDepends(depender_index, *lib, - true, emitted); + this->AddInterfaceDepends(depender_index, *lib, emitted); } } } @@ -314,7 +312,6 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index, //---------------------------------------------------------------------------- void cmComputeTargetDepends::AddInterfaceDepends(int depender_index, const std::string& dependee_name, - bool linking, std::set<std::string> &emitted) { 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 // name conflict between an external library and an executable // within the project. - if(linking && dependee && + if(dependee && dependee->GetType() == cmTarget::EXECUTABLE && !dependee->IsExecutableWithExports()) { diff --git a/Source/cmComputeTargetDepends.h b/Source/cmComputeTargetDepends.h index 7553816..b99199f 100644 --- a/Source/cmComputeTargetDepends.h +++ b/Source/cmComputeTargetDepends.h @@ -53,7 +53,7 @@ private: bool ComputeFinalDepends(cmComputeComponentGraph const& ccg); void AddInterfaceDepends(int depender_index, 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, const std::string& config, std::set<std::string> &emitted); |