diff options
author | Brad King <brad.king@kitware.com> | 2015-09-29 14:10:03 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-09-29 14:10:03 (GMT) |
commit | def90d5fa5d6a69abd4975d9fe4d07b0c21c6712 (patch) | |
tree | df0593099ba60a092ea9a094c74a0e73ae66e7ff /Source/kwsys/SystemTools.cxx | |
parent | f23ab1a1501cf82a04b9f24c3324e314afd53fab (diff) | |
parent | cc144ebfd8b3a7b89e07c3b22b6a9e8540e5d0e2 (diff) | |
download | CMake-def90d5fa5d6a69abd4975d9fe4d07b0c21c6712.zip CMake-def90d5fa5d6a69abd4975d9fe4d07b0c21c6712.tar.gz CMake-def90d5fa5d6a69abd4975d9fe4d07b0c21c6712.tar.bz2 |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
-rw-r--r-- | Source/kwsys/SystemTools.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 80289b8..262af27 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -408,6 +408,7 @@ class SystemToolsPathCaseMap: // adds the elements of the env variable path to the arg passed in void SystemTools::GetPath(std::vector<std::string>& path, const char* env) { + size_t const old_size = path.size(); #if defined(_WIN32) && !defined(__CYGWIN__) const char pathSep = ';'; #else @@ -445,7 +446,7 @@ void SystemTools::GetPath(std::vector<std::string>& path, const char* env) done = true; } } - for(std::vector<std::string>::iterator i = path.begin(); + for(std::vector<std::string>::iterator i = path.begin() + old_size; i != path.end(); ++i) { SystemTools::ConvertToUnixSlashes(*i); |