This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via f6bf2b07712c8bd5c4a05d7ff24c485a1ab993ea (commit) via 1a38a5d65fa33f8ff06104b23f9bd38110387ddc (commit) from 0f6284aa7a356a6b321e72911e34f6cec93fb70b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6bf2b07712c8bd5c4a05d7ff24c485a1ab993ea commit f6bf2b07712c8bd5c4a05d7ff24c485a1ab993ea Merge: 0f6284a 1a38a5d Author: Peter Kuemmel <syntheti...@gmx.net> AuthorDate: Sun Jun 10 09:24:21 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Jun 10 09:24:21 2012 -0400 Merge topic 'ninja-cldeps' into next 1a38a5d Ninja: allow spaces in cldeps's .d file http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a38a5d65fa33f8ff06104b23f9bd38110387ddc commit 1a38a5d65fa33f8ff06104b23f9bd38110387ddc Author: Peter Kuemmel <syntheti...@gmx.net> AuthorDate: Sun Jun 10 15:22:01 2012 +0200 Commit: Peter Kuemmel <syntheti...@gmx.net> CommitDate: Sun Jun 10 15:22:01 2012 +0200 Ninja: allow spaces in cldeps's .d file diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index d6cafc5..0b9a2fc 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -517,7 +517,7 @@ static string getArg(string& cmdline) { if (i >= cmdline.size()) usage("Couldn't parse arguments."); if (!in_quoted && cmdline[i] == ' ') - break; + break; // "a b" "x y" if (cmdline[i] == '"') in_quoted = !in_quoted; } @@ -560,9 +560,12 @@ static void outputDepFile(const string& dfile, const string& objfile, if (!out) 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) { - string tmp = *i; + tmp = *i; doEscape(tmp, "\\", "\\\\"); doEscape(tmp, " ", "\\ "); //doEscape(tmp, "(", "("); // TODO ninja cant read ( and ) @@ -594,10 +597,14 @@ int main() { string srcfile, dfile, objfile, prefix, clpath, rest; parseCommandLine(GetCommandLine(), srcfile, dfile, objfile, prefix, clpath, rest); - //fprintf(stderr, "D: %s\n", dfile.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()); +#if 0 + fprintf(stderr, "\n\ncmcldebug:\n"); + fprintf(stderr, ".d : %s\n", dfile.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; Subprocess* subproc = subprocs.Add(clpath + " /showIncludes " + rest); ----------------------------------------------------------------------- Summary of changes: Source/cmcldeps.cxx | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits