diff options
Diffstat (limited to 'Source')
| -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); |