diff options
author | Brad King <brad.king@kitware.com> | 2014-06-12 20:22:11 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-06-23 13:17:00 (GMT) |
commit | 0dc9e88d76fa74440fc3b38032738a21ce72f2d7 (patch) | |
tree | 5ba1a5691a912da3790f68827d89e6cae3fe6453 /Source/cmTarget.h | |
parent | 4ac72455fd7027039d498f007fdfe7c1d819b9f9 (diff) | |
download | CMake-0dc9e88d76fa74440fc3b38032738a21ce72f2d7.zip CMake-0dc9e88d76fa74440fc3b38032738a21ce72f2d7.tar.gz CMake-0dc9e88d76fa74440fc3b38032738a21ce72f2d7.tar.bz2 |
cmTarget: Remove 'head' argument from GetLinkImplementation
Many of the 'head' arguments added by commit v2.8.11~289^2~1 (Make
linking APIs aware of 'head' target, 2013-01-04) turned out not to be
needed. The "link implementation" of a target never needs to be
computed with anything but itself as the 'head' target (except for
CMP0022 OLD behavior because then it is the link interface).
Remove the unused 'head' target paths. Add "internal" versions of
cmTarget::GetDirectLinkLibraries and GetLinkImplementationLibraries
to support the CMP0022 OLD behavior without otherwise exposing the
'head' target option of these methods.
Diffstat (limited to 'Source/cmTarget.h')
-rw-r--r-- | Source/cmTarget.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 8c6955e..8cf962f 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -158,8 +158,7 @@ public: const LinkLibraryVectorType &GetOriginalLinkLibraries() const {return this->OriginalLinkLibraries;} void GetDirectLinkLibraries(const std::string& config, - std::vector<std::string> &, - cmTarget const* head) const; + std::vector<std::string> &) const; /** Compute the link type to use for the given configuration. */ LinkLibraryType ComputeLinkType(const std::string& config) const; @@ -291,12 +290,11 @@ public: // Needed only for OLD behavior of CMP0003. std::vector<std::string> WrongConfigLibraries; }; - LinkImplementation const* GetLinkImplementation(const std::string& config, - cmTarget const* head) const; + LinkImplementation const* + GetLinkImplementation(const std::string& config) const; - LinkImplementation const* GetLinkImplementationLibraries( - const std::string& config, - cmTarget const* head) const; + LinkImplementation const* + GetLinkImplementationLibraries(const std::string& config) const; /** Link information from the transitive closure of the link implementation and the interfaces of its dependencies. */ @@ -750,6 +748,12 @@ private: cmTarget const* head, bool &exists) const; + void GetDirectLinkLibrariesInternal(const std::string& config, + std::vector<std::string>& libs, + cmTarget const* head) const; + LinkImplementation const* + GetLinkImplementationLibrariesInternal(const std::string& config, + cmTarget const* head) const; void ComputeLinkImplementation(const std::string& config, LinkImplementation& impl, cmTarget const* head) const; |