summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2001-12-17 22:44:24 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2001-12-17 22:44:24 (GMT)
commite89d9d3378dd9728b10f0f17363c04662c100543 (patch)
tree2ab8d9a56c3360510e948997885c0ddab4fba75f /Source/cmSystemTools.cxx
parentfa53ab0807c7a6ad685157879ab2419c08f6dab3 (diff)
downloadCMake-e89d9d3378dd9728b10f0f17363c04662c100543.zip
CMake-e89d9d3378dd9728b10f0f17363c04662c100543.tar.gz
CMake-e89d9d3378dd9728b10f0f17363c04662c100543.tar.bz2
Better handling of new lines when moving from dos to unix
Diffstat (limited to 'Source/cmSystemTools.cxx')
-rw-r--r--Source/cmSystemTools.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index c896ca8..962cfe5 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -629,9 +629,9 @@ void cmSystemTools::GetArguments(std::string& line,
std::vector<std::string>& arguments)
{
// 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).
- cmRegularExpression quotedArgument("[ \t]*(\"([^\"\\]|[\\].)*\")[ \t]*");
+ cmRegularExpression quotedArgument("[ \t]*(\"([^\"\\]|[\\].)*\")[ \t\r]*");
bool done = false;
while(!done)