diff options
author | Brad King <brad.king@kitware.com> | 2018-09-06 18:21:06 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-09-07 13:23:43 (GMT) |
commit | bea390e9bd68e1aa7d86b6aef7384f502c39068c (patch) | |
tree | b19be7471586c47e8a5b1a72f433a773a62ccee8 /Source/cmComputeTargetDepends.h | |
parent | fc7e4d1ed85370d03acbd62bc753cced3550752b (diff) | |
download | CMake-bea390e9bd68e1aa7d86b6aef7384f502c39068c.zip CMake-bea390e9bd68e1aa7d86b6aef7384f502c39068c.tar.gz CMake-bea390e9bd68e1aa7d86b6aef7384f502c39068c.tar.bz2 |
Fix dependency propagation through same-name imported targets
If two imported targets in different directories have the same name we
should still be able to propagate transitive link dependencies from
both. Fix the target and link dependency analyzers to de-duplicate
targets using target pointers rather than target names since the
pointers will not be duplicated even if the names are.
Issue: #18345
Diffstat (limited to 'Source/cmComputeTargetDepends.h')
-rw-r--r-- | Source/cmComputeTargetDepends.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmComputeTargetDepends.h b/Source/cmComputeTargetDepends.h index e93e376..3046e8a 100644 --- a/Source/cmComputeTargetDepends.h +++ b/Source/cmComputeTargetDepends.h @@ -51,11 +51,11 @@ private: bool ComputeFinalDepends(cmComputeComponentGraph const& ccg); void AddInterfaceDepends(int depender_index, cmLinkItem const& dependee_name, const std::string& config, - std::set<std::string>& emitted); + std::set<cmLinkItem>& emitted); void AddInterfaceDepends(int depender_index, cmGeneratorTarget const* dependee, const std::string& config, - std::set<std::string>& emitted); + std::set<cmLinkItem>& emitted); cmGlobalGenerator* GlobalGenerator; bool DebugMode; bool NoCycles; |