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

Ninja: allow spaces in cldeps's .d file

This commit is contained in:
Peter Kuemmel 2012-06-10 15:22:01 +02:00
parent db607dea8d
commit 1a38a5d65f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmcldeps.cxx
View File

@ -517,7 +517,7 @@ static string getArg(string& cmdline) {
if (i >= cmdline.size()) if (i >= cmdline.size())
usage("Couldn't parse arguments."); usage("Couldn't parse arguments.");
if (!in_quoted && cmdline[i] == ' ') if (!in_quoted && cmdline[i] == ' ')
break; break; // "a b" "x y"
if (cmdline[i] == '"') if (cmdline[i] == '"')
in_quoted = !in_quoted; in_quoted = !in_quoted;
} }
@ -560,9 +560,12 @@ static void outputDepFile(const string& dfile, const string& objfile,
if (!out) if (!out)
return; return;
fprintf(out, "%s: \\\n", objfile.c_str()); string tmp = objfile;
doEscape(tmp, " ", "\\ ");
fprintf(out, "%s: \\\n", tmp.c_str());
for (vector<string>::iterator i(incs.begin()); i != incs.end(); ++i) { for (vector<string>::iterator i(incs.begin()); i != incs.end(); ++i) {
string tmp = *i; tmp = *i;
doEscape(tmp, "\\", "\\\\"); doEscape(tmp, "\\", "\\\\");
doEscape(tmp, " ", "\\ "); doEscape(tmp, " ", "\\ ");
//doEscape(tmp, "(", "("); // TODO ninja cant read ( and ) //doEscape(tmp, "(", "("); // TODO ninja cant read ( and )
@ -594,10 +597,14 @@ int main() {
string srcfile, dfile, objfile, prefix, clpath, rest; string srcfile, dfile, objfile, prefix, clpath, rest;
parseCommandLine(GetCommandLine(), srcfile, dfile, objfile, prefix, clpath, rest); parseCommandLine(GetCommandLine(), srcfile, dfile, objfile, prefix, clpath, rest);
//fprintf(stderr, "D: %s\n", dfile.c_str()); #if 0
//fprintf(stderr, "OBJ: %s\n", objfile.c_str()); fprintf(stderr, "\n\ncmcldebug:\n");
//fprintf(stderr, "CL: %s\n", clpath.c_str()); fprintf(stderr, ".d : %s\n", dfile.c_str());
//fprintf(stderr, "REST: %s\n", rest.c_str()); fprintf(stderr, "OBJ : %s\n", objfile.c_str());
fprintf(stderr, "CL : %s\n", clpath.c_str());
fprintf(stderr, "REST: %s\n", rest.c_str());
fprintf(stderr, "\n\n");
#endif
SubprocessSet subprocs; SubprocessSet subprocs;
Subprocess* subproc = subprocs.Add(clpath + " /showIncludes " + rest); Subprocess* subproc = subprocs.Add(clpath + " /showIncludes " + rest);