diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-07 18:13:33 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-07 18:13:33 (GMT) |
| commit | 3b4895fa35e4a96022abd99b07002a7d2ab3a968 (patch) | |
| tree | e985a95b71727c813ad6106eef311ffa01caf665 /Source/cmMakefile.cxx | |
| parent | 2232e97a6ed4a338b814d1ba3d62a7ffa9ef6e7f (diff) | |
| download | CMake-3b4895fa35e4a96022abd99b07002a7d2ab3a968.zip CMake-3b4895fa35e4a96022abd99b07002a7d2ab3a968.tar.gz CMake-3b4895fa35e4a96022abd99b07002a7d2ab3a968.tar.bz2 | |
cmTarget: Inline MergeLinkLibraries into only caller
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index df993ce..c022b44 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1863,7 +1863,16 @@ void cmMakefile::AddGlobalLinkInformation(const std::string& name, } } } - target.MergeLinkLibraries(*this, name, this->LinkLibraries); + + cmTarget::LinkLibraryVectorType::const_iterator i = + this->LinkLibraries.begin(); + for (; i != this->LinkLibraries.end(); ++i) { + // This is equivalent to the target_link_libraries plain signature. + target.AddLinkLibrary(*this, name, i->first, i->second); + target.AppendProperty( + "INTERFACE_LINK_LIBRARIES", + target.GetDebugGeneratorExpressions(i->first, i->second).c_str()); + } } void cmMakefile::AddAlias(const std::string& lname, std::string const& tgtName) |