dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 06:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmTarget: Inline MergeLinkLibraries into only caller

Browse Source
This commit is contained in:
Stephen Kelly
2016-10-07 20:13:33 +02:00
parent 2232e97a6e
commit 3b4895fa35
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmMakefile.cxx
View File

@@ -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)

13
Source/cmTarget.cxx
View File

@@ -476,19 +476,6 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
return this->Makefile->GetOrCreateSource(src);
}
void cmTarget::MergeLinkLibraries(cmMakefile& mf, const std::string& selfname,
const LinkLibraryVectorType& libs)
{
LinkLibraryVectorType::const_iterator i = libs.begin();
for (; i != libs.end(); ++i) {
// This is equivalent to the target_link_libraries plain signature.
this->AddLinkLibrary(mf, selfname, i->first, i->second);
this->AppendProperty(
"INTERFACE_LINK_LIBRARIES",
this->GetDebugGeneratorExpressions(i->first, i->second).c_str());
}
}
void cmTarget::AddLinkDirectory(const std::string& d)
{
// Make sure we don't add unnecessary search directories.

3
Source/cmTarget.h
View File

@@ -153,9 +153,6 @@ public:
cmListFileContext const& lfc);
void GetTllSignatureTraces(std::ostream& s, TLLSignature sig) const;
void MergeLinkLibraries(cmMakefile& mf, const std::string& selfname,
const LinkLibraryVectorType& libs);
const std::vector<std::string>& GetLinkDirectories() const;
void AddLinkDirectory(const std::string& d);