From cf271b7b3fcf94de010e154085923d71e4546e17 Mon Sep 17 00:00:00 2001
From: Thomas Herz <thomas.herz@kuka.com>
Date: Thu, 7 May 2015 00:45:01 +0200
Subject: [PATCH 1/2] Use always forward slashes in response files when
 compiling with gcc on windows

Avoids problems with broken gcc versions which cannot handle backslashes correctly
---
 Source/cmGlobalNinjaGenerator.cxx | 14 +++++++++++---
 Source/cmGlobalNinjaGenerator.h   |  4 ++--
 Source/cmNinjaTargetGenerator.cxx |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 678d60b..ed5ba3b 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -96,7 +96,7 @@ std::string cmGlobalNinjaGenerator::EncodePath(const std::string &path)
 {
   std::string result = path;
 #ifdef _WIN32
-  if(UsingMinGW)
+  if(IsGCCOnWindows())
     cmSystemTools::ReplaceString(result, "\\", "/");
   else
     cmSystemTools::ReplaceString(result, "/", "\\");
@@ -554,9 +554,17 @@ void cmGlobalNinjaGenerator
 {
   if (makefile->IsOn("CMAKE_COMPILER_IS_MINGW"))
     {
-    UsingMinGW = true;
+#ifdef _WIN32
+    UsingGCCOnWindows = true;
+#endif
     this->EnableMinGWLanguage(makefile);
     }
+#ifdef _WIN32
+  else if (makefile->IsOn("CMAKE_COMPILER_IS_GNUCC"))
+    {
+    UsingGCCOnWindows = true;
+    }
+#endif
   if (std::find(langs.begin(), langs.end(), "Fortran") != langs.end())
     {
     cmSystemTools::Error("The Ninja generator does not support Fortran yet.");
@@ -573,7 +581,7 @@ void cmGlobalNinjaGenerator
     }
 }
 
-bool cmGlobalNinjaGenerator::UsingMinGW = false;
+bool cmGlobalNinjaGenerator::UsingGCCOnWindows = false;
 
 // Implemented by:
 //   cmGlobalUnixMakefileGenerator3
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index d7b3add..8607614 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -156,7 +156,7 @@ public:
                            const std::string& comment = "");
 
 
-  static bool IsMinGW() { return UsingMinGW; }
+  static bool IsGCCOnWindows() { return UsingGCCOnWindows; }
 
 
 public:
@@ -386,7 +386,7 @@ private:
   typedef std::map<std::string, cmTarget*> TargetAliasMap;
   TargetAliasMap TargetAliases;
 
-  static bool UsingMinGW;
+  static bool UsingGCCOnWindows;
 
 };
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index dfd3c04..9eb640a 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -175,7 +175,7 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile const* source,
                                         // needed by cmcldeps
                                             false,
                                             this->GetConfigName());
-    if(cmGlobalNinjaGenerator::IsMinGW())
+    if(cmGlobalNinjaGenerator::IsGCCOnWindows())
       cmSystemTools::ReplaceString(includeFlags, "\\", "/");
 
     this->LocalGenerator->AppendFlags(languageFlags, includeFlags);
-- 
1.9.4.msysgit.2

From c81f369d7bd35f3ad3f0b806aed0c4cba26f77d3 Mon Sep 17 00:00:00 2001
From: Thomas Herz <thomas.herz@kuka.com>
Date: Thu, 7 May 2015 00:48:03 +0200
Subject: [PATCH 2/2] Do not use newlines in response files when compiling with
 gcc on windows

Avoids problems with broken gcc versions which cannot handle windows newlines correctly
---
 Source/cmNinjaNormalTargetGenerator.cxx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 155a30e..0ff5d62 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -202,7 +202,12 @@ cmNinjaNormalTargetGenerator
         responseFlag += rspfile;
 
         // build response file content
-        rspcontent = "$in_newline $LINK_PATH $LINK_LIBRARIES";
+        if(cmGlobalNinjaGenerator::IsGCCOnWindows()) {
+          rspcontent = "$in";
+        } else {
+          rspcontent = "$in_newline";
+        }
+        rspcontent += " $LINK_PATH $LINK_LIBRARIES";
         vars.Objects = responseFlag.c_str();
         vars.LinkLibraries = "";
     }
-- 
1.9.4.msysgit.2

From dbdab40f9ec7c9c2592a76ccda1c87fa3ce05ed0 Mon Sep 17 00:00:00 2001
From: Thomas Herz <thomas.herz@kuka.com>
Date: Fri, 8 May 2015 15:38:04 +0200
Subject: [PATCH] ninja: Replaced last left MinGW-check with GCCOnWindows-check

---
 Source/cmNinjaNormalTargetGenerator.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4c51d23..771ecc4 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -565,7 +565,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     vars["TARGET_PDB"] = base + suffix + dbg_suffix;
     }
 
-  if (mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
+  if (this->GetGlobalGenerator()->IsGCCOnWindows())
     {
     const std::string objPath = GetTarget()->GetSupportDirectory();
     vars["OBJECT_DIR"] = ConvertToNinjaPath(objPath);
-- 
1.9.4.msysgit.2