summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-12-07 18:27:52 (GMT)
committerBrad King <brad.king@kitware.com>2012-12-07 20:29:21 (GMT)
commitf0d938549eead63fb86bec28c299a1bceacbdd6b (patch)
treee73fec148a778613f42953c3ed0c90b4d6351d6b /Source/cmTarget.cxx
parent2bc22bdaacfc0f0f91c229685dc5dbadd0267601 (diff)
downloadCMake-f0d938549eead63fb86bec28c299a1bceacbdd6b.zip
CMake-f0d938549eead63fb86bec28c299a1bceacbdd6b.tar.gz
CMake-f0d938549eead63fb86bec28c299a1bceacbdd6b.tar.bz2
Makefile: Use modern link information for framework search paths
Use cmComputeLinkInformation::GetFrameworkPaths to get the list of framework paths needed by the linker. Drop the now unused framework information from the old-style cmTarget link dependency analysis.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r--Source/cmTarget.cxx21
1 files changed, 0 insertions, 21 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index be20464..de3b23c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2093,26 +2093,6 @@ bool cmTarget::NameResolvesToFramework(const std::string& libname)
}
//----------------------------------------------------------------------------
-bool cmTarget::AddFramework(const std::string& libname, LinkLibraryType)
-{
- if(this->NameResolvesToFramework(libname.c_str()))
- {
- std::string frameworkDir = libname;
- frameworkDir += "/../";
- frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
- std::vector<std::string>::iterator i =
- std::find(this->Frameworks.begin(),
- this->Frameworks.end(), frameworkDir);
- if(i == this->Frameworks.end())
- {
- this->Frameworks.push_back(frameworkDir);
- }
- return true;
- }
- return false;
-}
-
-//----------------------------------------------------------------------------
void cmTarget::AddLinkLibrary(cmMakefile& mf,
const char *target, const char* lib,
LinkLibraryType llt)
@@ -2122,7 +2102,6 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
{
return;
}
- this->AddFramework(lib, llt);
cmTarget::LibraryID tmp;
tmp.first = lib;
tmp.second = llt;