diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-16 17:04:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-16 17:04:21 (GMT) |
| commit | a0dc1354fe5effa1ff484b441595f8bdb6da3533 (patch) | |
| tree | 9ee1a2efad2ddbe1c2c32ab7623e002ef984ea58 /Source/cmTarget.h | |
| parent | 66e88af6d0e3fab6cba6876cf26dd30ebbb733fb (diff) | |
| parent | 1ca0c0e94ac39c895d5896b0193cbc7b963ff087 (diff) | |
| download | CMake-a0dc1354fe5effa1ff484b441595f8bdb6da3533.zip CMake-a0dc1354fe5effa1ff484b441595f8bdb6da3533.tar.gz CMake-a0dc1354fe5effa1ff484b441595f8bdb6da3533.tar.bz2 | |
Merge topic 'refactor-link-internals'
1ca0c0e9 cmTarget: Refactor internal imported LinkInterface map
102eea60 cmTarget: Simplify internal ComputeLinkInterfaceLibraries method
b0f57408 cmTarget: Move ComputeLinkInterfaceLibraries to internals
c69e8a55 cmTarget: Refactor internal LinkInterface map
4db3990e cmTarget: Drop 'head' argument from processSources
4b8130b8 cmTarget: Drop 'head' argument from GetSourceFiles
4c763dd1 cmTarget: Drop 'head' argument from GetLanguages
190cabe7 cmTarget: Drop 'head' argument from ComputeLinkImplementationLanguages
Diffstat (limited to 'Source/cmTarget.h')
| -rw-r--r-- | Source/cmTarget.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h index c2efb14..4005443 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -161,8 +161,7 @@ public: * Get the list of the source files used by this target */ void GetSourceFiles(std::vector<cmSourceFile*> &files, - const std::string& config, - cmTarget const* head = 0) const; + const std::string& config) const; bool GetConfigCommonSourceFiles(std::vector<cmSourceFile*>& files) const; /** @@ -489,8 +488,7 @@ public: // information to forward these property changes to the targets // until we have per-target object file properties. void GetLanguages(std::set<std::string>& languages, - std::string const& config, - cmTarget const* head = 0) const; + std::string const& config) const; /** Return whether this target is an executable with symbol exports enabled. */ @@ -717,8 +715,7 @@ private: bool contentOnly) const; void GetSourceFiles(std::vector<std::string> &files, - const std::string& config, - cmTarget const* head = 0) const; + const std::string& config) const; private: std::string Name; std::vector<cmCustomCommand> PreBuildCommands; @@ -781,12 +778,6 @@ private: GetImportLinkInterface(const std::string& config, cmTarget const* head, bool usage_requirements_only) const; - const char* ComputeLinkInterfaceLibraries(const std::string& config, - LinkInterface& iface, - cmTarget const* head, - bool usage_requirements_only, - bool &exists) const; - LinkImplementation const* GetLinkImplementationLibrariesInternal(const std::string& config, cmTarget const* head) const; @@ -794,8 +785,7 @@ private: LinkImplementation& impl, cmTarget const* head) const; void ComputeLinkImplementationLanguages(const std::string& config, - LinkImplementation& impl, - cmTarget const* head) const; + LinkImplementation& impl) const; void ComputeLinkClosure(const std::string& config, LinkClosure& lc) const; void ExpandLinkItems(std::string const& prop, std::string const& value, |