kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Improve paths on windows

Browse Source
This commit is contained in:
Andy Cedilnik 2003-08-04 11:48:18 -04:00
parent 4515c33d32
commit 867f88a93f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmSystemTools.cxx
View File

@ -309,6 +309,14 @@ bool cmSystemTools::RunSingleCommand(
std::vector<std::string> args; std::vector<std::string> args;
std::string arg; std::string arg;
bool win_path = false;
if ( command[0] != '/' && command[1] == ':' && command[2] == '\\' ||
command[0] == '\"' && command[1] != '/' && command[2] == ':' && command[3] == '\\' ||
command[0] == '\\' && command[1] == '\\')
{
win_path = true;
}
// Split the command into an argv array. // Split the command into an argv array.
for(const char* c = command; *c;) for(const char* c = command; *c;)
{ {
@ -338,7 +346,7 @@ bool cmSystemTools::RunSingleCommand(
// Parse an unquoted argument. // Parse an unquoted argument.
while(*c && *c != ' ' && *c != '\t') while(*c && *c != ' ' && *c != '\t')
{ {
if(*c == '\\') if(*c == '\\' && !win_path)
{ {
++c; ++c;
if(*c) if(*c)
@ -374,6 +382,7 @@ bool cmSystemTools::RunSingleCommand(
{ {
*output = ""; *output = "";
} }
cmsysProcess* cp = cmsysProcess_New(); cmsysProcess* cp = cmsysProcess_New();
cmsysProcess_SetCommand(cp, &*argv.begin()); cmsysProcess_SetCommand(cp, &*argv.begin());
cmsysProcess_SetWorkingDirectory(cp, dir); cmsysProcess_SetWorkingDirectory(cp, dir);