diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-22 15:35:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-22 17:38:18 (GMT) |
| commit | b41b30f16e1ae2c8248321dbf51347b7a4b90d30 (patch) | |
| tree | b99773a7e7667b9568b1159aa0673e70dc0bfb91 /Source/cmFileCommand.cxx | |
| parent | f2d97c1cdf06f8575d0b23130db4ffa725ca5161 (diff) | |
| download | CMake-b41b30f16e1ae2c8248321dbf51347b7a4b90d30.zip CMake-b41b30f16e1ae2c8248321dbf51347b7a4b90d30.tar.gz CMake-b41b30f16e1ae2c8248321dbf51347b7a4b90d30.tar.bz2 | |
Update use of KWSys SystemTools::SplitString for new signature
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 aae70b1..2e7829b 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 @@ -2490,11 +2490,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 += ";"; @@ -2504,7 +2504,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); |