diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2015-09-28 13:29:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-29 14:09:57 (GMT) |
| commit | cc144ebfd8b3a7b89e07c3b22b6a9e8540e5d0e2 (patch) | |
| tree | ccdf9307dde9f8a96141fcc16f629be605899a50 /SystemTools.cxx | |
| parent | 29ad06947244d1a0f04deaf5360e2f1d1765d903 (diff) | |
| download | CMake-cc144ebfd8b3a7b89e07c3b22b6a9e8540e5d0e2.zip CMake-cc144ebfd8b3a7b89e07c3b22b6a9e8540e5d0e2.tar.gz CMake-cc144ebfd8b3a7b89e07c3b22b6a9e8540e5d0e2.tar.bz2 | |
KWSys 2015-09-28 (2089567a)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 2089567a | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dc4e4a55..2089567a
Vitaly Baranov (1):
2089567a SystemTools: Fix GetPath to not affect existing output vector entries
Diffstat (limited to 'SystemTools.cxx')
| -rw-r--r-- | SystemTools.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/SystemTools.cxx b/SystemTools.cxx index 80289b8..262af27 100644 --- a/SystemTools.cxx +++ b/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); |