diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-25 13:56:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-25 13:57:35 (GMT) |
| commit | e9ec0cc3bb9ee2a03cdf2ad45712ea41cc8fac81 (patch) | |
| tree | cfa419d7d5c1e3f60fb4628a3c581fd7a38c9e66 /Source/cmFileCommand.cxx | |
| parent | 8848a1c07a47813d4d074292038add1c8822d158 (diff) | |
| parent | b41b30f16e1ae2c8248321dbf51347b7a4b90d30 (diff) | |
| download | CMake-e9ec0cc3bb9ee2a03cdf2ad45712ea41cc8fac81.zip CMake-e9ec0cc3bb9ee2a03cdf2ad45712ea41cc8fac81.tar.gz CMake-e9ec0cc3bb9ee2a03cdf2ad45712ea41cc8fac81.tar.bz2 | |
Merge topic 'update-kwsys'
b41b30f16e Update use of KWSys SystemTools::SplitString for new signature
f2d97c1cdf Merge branch 'upstream-KWSys' into update-kwsys
6d7fdedde6 KWSys 2018-06-22 (49068d94)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2165
Diffstat (limited to 'Source/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index dcb79f7..e39630e 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -7,7 +7,7 @@ #include "cmsys/FStream.hxx" #include "cmsys/Glob.hxx" #include "cmsys/RegularExpression.hxx" -#include "cmsys/String.hxx" + #include <algorithm> #include <assert.h> #include <memory> // IWYU pragma: keep @@ -2484,11 +2484,11 @@ bool cmFileCommand::HandleCMakePathCommand( #else char pathSep = ':'; #endif - std::vector<cmsys::String> path = cmSystemTools::SplitString(*i, pathSep); + std::vector<std::string> path = cmSystemTools::SplitString(*i, pathSep); i++; const char* var = i->c_str(); std::string value; - for (std::vector<cmsys::String>::iterator j = path.begin(); j != path.end(); + for (std::vector<std::string>::iterator j = path.begin(); j != path.end(); ++j) { if (j != path.begin()) { value += ";"; @@ -2498,7 +2498,7 @@ bool cmFileCommand::HandleCMakePathCommand( } else { *j = cmSystemTools::ConvertToOutputPath(*j); // remove double quotes in the path - cmsys::String& s = *j; + std::string& s = *j; if (s.size() > 1 && s[0] == '\"' && s[s.size() - 1] == '\"') { s = s.substr(1, s.size() - 2); |