Better handling of new lines when moving from dos to unix
This commit is contained in:
parent
fa53ab0807
commit
e89d9d3378
|
@ -629,9 +629,9 @@ void cmSystemTools::GetArguments(std::string& line,
|
||||||
std::vector<std::string>& arguments)
|
std::vector<std::string>& arguments)
|
||||||
{
|
{
|
||||||
// Match a normal argument (not quoted, no spaces).
|
// Match a normal argument (not quoted, no spaces).
|
||||||
cmRegularExpression normalArgument("[ \t]*(([^ \t\\]|[\\].)+)[ \t]*");
|
cmRegularExpression normalArgument("[ \t]*(([^ \t\r\\]|[\\].)+)[ \t\r]*");
|
||||||
// Match a quoted argument (surrounded by double quotes, spaces allowed).
|
// Match a quoted argument (surrounded by double quotes, spaces allowed).
|
||||||
cmRegularExpression quotedArgument("[ \t]*(\"([^\"\\]|[\\].)*\")[ \t]*");
|
cmRegularExpression quotedArgument("[ \t]*(\"([^\"\\]|[\\].)*\")[ \t\r]*");
|
||||||
|
|
||||||
bool done = false;
|
bool done = false;
|
||||||
while(!done)
|
while(!done)
|
||||||
|
|
Loading…
Reference in New Issue