diff options
| author | Peter Kuemmel <syntheticpp@gmx.net> | 2012-06-14 12:37:08 (GMT) |
|---|---|---|
| committer | Peter Kuemmel <syntheticpp@gmx.net> | 2012-06-14 12:37:08 (GMT) |
| commit | 6e6886d3bd4037905c320b8d88417096f6ba3e2e (patch) | |
| tree | 8e62e99a8020f1196c7bda60da5fca030c247665 /Source/cmcldeps.cxx | |
| parent | 654608600474a27eeddafd50ea25c7e3882fd460 (diff) | |
| download | CMake-6e6886d3bd4037905c320b8d88417096f6ba3e2e.zip CMake-6e6886d3bd4037905c320b8d88417096f6ba3e2e.tar.gz CMake-6e6886d3bd4037905c320b8d88417096f6ba3e2e.tar.bz2 | |
Ninja: ninja now also could read parentheses in .d files
Diffstat (limited to 'Source/cmcldeps.cxx')
| -rw-r--r-- | Source/cmcldeps.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index 2a7f8aa..65a44a8 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -580,8 +580,6 @@ static void outputDepFile(const string& dfile, const string& objfile, tmp = *i; doEscape(tmp, "\\", "/"); doEscape(tmp, " ", "\\ "); - //doEscape(tmp, "(", "\\("); // TODO ninja can't read ( and ) - //doEscape(tmp, ")", "\\)"); fprintf(out, "%s \\\n", tmp.c_str()); //printf("include: %s \n", tmp.c_str()); } @@ -640,12 +638,10 @@ static int process( const string& srcfilename, bool isFirstLine = true; // cl prints always first the source filename while (getline(ss, line)) { if (startsWith(line, prefix)) { - if (!contains(line, "(") && !contains(line, ")")) { - string inc = trimLeadingSpace(line.substr(prefix.size()).c_str()); - if (inc[inc.size() - 1] == '\r') // blech, stupid \r\n - inc = inc.substr(0, inc.size() - 1); - includes.push_back(inc); - } + string inc = trimLeadingSpace(line.substr(prefix.size()).c_str()); + if (inc[inc.size() - 1] == '\r') // blech, stupid \r\n + inc = inc.substr(0, inc.size() - 1); + includes.push_back(inc); } else { if (!isFirstLine || !startsWith(line, srcfilename)) { if (!quiet) { |