summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-07-11 14:31:36 (GMT)
committerBrad King <brad.king@kitware.com>2016-07-11 14:31:36 (GMT)
commit2bef0758e8974fe84db1dc24dc0a50d6c88ace1d (patch)
tree3d2b5a3c6bb01138a91a0acbeda8ca1d2166507a
parente31084e65745f9dd422c6aff0a2ed4ada6918805 (diff)
parent54475018ae3ea04558b5372bc270e7c08af723f4 (diff)
downloadCMake-2bef0758e8974fe84db1dc24dc0a50d6c88ace1d.zip
CMake-2bef0758e8974fe84db1dc24dc0a50d6c88ace1d.tar.gz
CMake-2bef0758e8974fe84db1dc24dc0a50d6c88ace1d.tar.bz2
Merge branch 'find-command-restore-PATH-on-unix' into release
-rw-r--r--Source/cmFindBase.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 082bbf0..c785e6c 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -226,12 +226,10 @@ void cmFindBase::FillSystemEnvironmentPath()
paths.AddEnvPath(this->EnvironmentPath);
#if defined(_WIN32) || defined(__CYGWIN__)
paths.AddEnvPrefixPath("PATH", true);
- paths.AddEnvPath("PATH");
#endif
- } else {
- // Add PATH
- paths.AddEnvPath("PATH");
}
+ // Add PATH
+ paths.AddEnvPath("PATH");
paths.AddSuffixes(this->SearchPathSuffixes);
}