summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-10-07 18:13:33 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-07 18:13:33 (GMT)
commit3e8d47d18b4db6b4621ee5e4864dde234ad8a282 (patch)
tree42f4b9435cf32ae42be09c8d3e710af23f426dff
parent3b4895fa35e4a96022abd99b07002a7d2ab3a968 (diff)
downloadCMake-3e8d47d18b4db6b4621ee5e4864dde234ad8a282.zip
CMake-3e8d47d18b4db6b4621ee5e4864dde234ad8a282.tar.gz
CMake-3e8d47d18b4db6b4621ee5e4864dde234ad8a282.tar.bz2
cmMakefile: Remove useless link directory container
It is never populated - a find will never find anything.
-rw-r--r--Source/cmMakefile.cxx5
-rw-r--r--Source/cmMakefile.h3
2 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c022b44..0efd92c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1857,10 +1857,7 @@ void cmMakefile::AddGlobalLinkInformation(const std::string& name,
if (*j->rbegin() == '/') {
newdir = j->substr(0, j->size() - 1);
}
- if (std::find(this->LinkDirectories.begin(), this->LinkDirectories.end(),
- newdir) == this->LinkDirectories.end()) {
- target.AddLinkDirectory(*j);
- }
+ target.AddLinkDirectory(*j);
}
}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 40344ce..92907cd 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -805,9 +805,6 @@ protected:
// Tests
std::map<std::string, cmTest*> Tests;
- // The link-library paths. Order matters, use std::vector (not std::set).
- std::vector<std::string> LinkDirectories;
-
// The set of include directories that are marked as system include
// directories.
std::set<std::string> SystemIncludeDirectories;