diff options
author | Brad King <brad.king@kitware.com> | 2021-06-30 11:27:43 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-30 11:27:49 (GMT) |
commit | 85fe60ef032cd38a67f8b7dbedbb050590e4404f (patch) | |
tree | 2234d1c07201d45db9419b2f9fa8ad204109d096 /Source/cmGeneratorTarget.h | |
parent | 123b9e18f3d3de20864281264995744426d9d7b7 (diff) | |
parent | e27a76f1311ab4ad1be07df018ac748d4b725cea (diff) | |
download | CMake-85fe60ef032cd38a67f8b7dbedbb050590e4404f.zip CMake-85fe60ef032cd38a67f8b7dbedbb050590e4404f.tar.gz CMake-85fe60ef032cd38a67f8b7dbedbb050590e4404f.tar.bz2 |
Merge topic 'tll-out-of-dir'
e27a76f131 target_link_libraries: Restore transitive out-of-dir linking
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6285
Diffstat (limited to 'Source/cmGeneratorTarget.h')
-rw-r--r-- | Source/cmGeneratorTarget.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 0619279..e1909a4 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -1043,8 +1043,13 @@ private: bool& hadHeadSensitiveCondition, bool& hadContextSensitiveCondition, bool& hadLinkLanguageSensitiveCondition) const; + struct LookupLinkItemScope + { + cmLocalGenerator const* LG; + }; cm::optional<cmLinkItem> LookupLinkItem(std::string const& n, - cmListFileBacktrace const& bt) const; + cmListFileBacktrace const& bt, + LookupLinkItemScope* scope) const; std::vector<BT<std::string>> GetSourceFilePaths( std::string const& config) const; |