diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-28 14:35:42 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-28 14:35:42 (GMT) |
| commit | 9303da53ce980bf71df52f3e75ed18f93127d7b9 (patch) | |
| tree | 8b4686b904138452fdec0db0f343667bb70f7b0c /Source/cmTarget.h | |
| parent | d128c6c9b33f4ca3139352baee774a9e08f6c32e (diff) | |
| parent | 7b743a2e761783f930de41db3f7a706b065bbb2e (diff) | |
| download | CMake-9303da53ce980bf71df52f3e75ed18f93127d7b9.zip CMake-9303da53ce980bf71df52f3e75ed18f93127d7b9.tar.gz CMake-9303da53ce980bf71df52f3e75ed18f93127d7b9.tar.bz2 | |
Merge topic 'genex-head-sensitive-conditions'
7b743a2e cmTarget: Avoid re-computing head-independent link interfaces
807e4ffe Genex: Track whether an expression depends on the 'head' target
46099b82 cmTarget: Move ComputeLinkImplementation* to internals
438d9c7c cmTarget: Re-order link interface map lookup logic
fe665fdd cmTarget: Refactor link interface map storage
9d13e167 cmTarget: Remove duplicate link interface map
Diffstat (limited to 'Source/cmTarget.h')
| -rw-r--r-- | Source/cmTarget.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h index b4c8a0f..333e2ae 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -797,17 +797,13 @@ private: LinkImplementationLibraries const* GetLinkImplementationLibrariesInternal(const std::string& config, cmTarget const* head) const; - void ComputeLinkImplementationLibraries(const std::string& config, - LinkImplementation& impl, - cmTarget const* head) const; - void ComputeLinkImplementationLanguages(const std::string& config, - LinkImplementation& impl) const; void ComputeLinkClosure(const std::string& config, LinkClosure& lc) const; void ExpandLinkItems(std::string const& prop, std::string const& value, std::string const& config, cmTarget const* headTarget, bool usage_requirements_only, - std::vector<cmLinkItem>& items) const; + std::vector<cmLinkItem>& items, + bool& hadHeadSensitiveCondition) const; void LookupLinkItems(std::vector<std::string> const& names, std::vector<cmLinkItem>& items) const; |