[Cmake-commits] CMake branch, next, updated. v2.8.8-3112-g85f2622

[Peter Kuemmel]

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  85f2622eba565024a15e20b9e0abe07a2240530f (commit)
       via  12cc6434bfad53a4bc45b0ab36d27489346dfadc (commit)
       via  5590625fa3d3e6261cc5c9e39e02a205b1ed8027 (commit)
      from  003a4c4df76c0f44454776f4f0c9f91af10a41ec (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=85f2622eba565024a15e20b9e0abe07a2240530f
commit 85f2622eba565024a15e20b9e0abe07a2240530f
Merge: 003a4c4 12cc643
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 12 08:37:45 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 12 08:37:45 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    12cc643 Ninja: ninja can't read dep. pathes with parentheses
    5590625 Ninja: use slashes for include dirs, so also slahes are in the .d files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12cc6434bfad53a4bc45b0ab36d27489346dfadc
commit 12cc6434bfad53a4bc45b0ab36d27489346dfadc
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 12 14:36:39 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Tue Jun 12 14:36:39 2012 +0200

    Ninja: ninja can't read dep. pathes with parentheses

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index ac1c49a..549eeac 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -578,8 +578,8 @@ static void outputDepFile(const string& dfile, const string& objfile,
     tmp = *i;
     doEscape(tmp, "\\", "/");
     doEscape(tmp, " ", "\\ ");
-    //doEscape(tmp, "(", "("); // TODO ninja cant read ( and )
-    //doEscape(tmp, ")", ")");
+    //doEscape(tmp, "(", "\\("); // TODO ninja can't read ( and )
+    //doEscape(tmp, ")", "\\)");
     fprintf(out, "%s \\\n", tmp.c_str());
   }
 
@@ -637,12 +637,9 @@ int main() {
   string line;
   vector<string> includes;
   bool isFirstLine = true; // cl prints always first the source filename
-  std::string sysHeadersCamel =    "Program Files (x86)\\Microsoft ";
-  std::string sysHeadersLower = "program files (x86)\\microsoft ";
   while (getline(ss, line)) {
     if (startsWith(line, prefix)) {
-       if (!contains(line, sysHeadersCamel)
-           && !contains(line, sysHeadersLower)) {
+       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);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5590625fa3d3e6261cc5c9e39e02a205b1ed8027
commit 5590625fa3d3e6261cc5c9e39e02a205b1ed8027
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 12 13:52:32 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Tue Jun 12 13:52:32 2012 +0200

    Ninja: use slashes for include dirs, so also slahes are in the .d files

diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index b2c2aa8..54677bc 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -147,6 +147,9 @@ public:
                            const cmNinjaDeps& targets,
                            const std::string& comment = "");
 
+
+  static bool IsMinGW() { return UsingMinGW; }
+
 public:
   /// Default constructor.
   cmGlobalNinjaGenerator();
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 0e859b3..5c6a45d 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -154,6 +154,8 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile *source,
                                               language.c_str());
   std::string includeFlags =
     this->LocalGenerator->GetIncludeFlags(includes, language.c_str(), false);
+  if(cmGlobalNinjaGenerator::IsMinGW())
+    cmSystemTools::ReplaceString(includeFlags, "\\", "/");
   this->LocalGenerator->AppendFlags(flags, includeFlags.c_str());
   }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalNinjaGenerator.h   |    3 +++
 Source/cmNinjaTargetGenerator.cxx |    2 ++
 Source/cmcldeps.cxx               |    9 +++------
 3 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake