From ca658a456f80febe05e57bfae8448c8646960ddf Mon Sep 17 00:00:00 2001
From: Thomas Herz <thomas.herz@kuka.com>
Date: Fri, 8 May 2015 15:38:04 +0200
Subject: Ninja: Use forward slashes for linking with any GCC on Windows
 (#15439)

Fix a condition forgotten by commit b3de0dfe (Ninja: Use forward slashes
for any GCC on Windows, 2015-05-07).
---
 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);
-- 
cgit v0.12


From cf8ce7a39e425aa5ea6a4847f512b8e8628af61a Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 11 May 2015 09:00:25 -0400
Subject: RC: Do not override MinGW Makefiles generator preference

Update logic added in commit 957c2aac (RC: Simplify selection of
resource compiler based on C/C++ toolchain, 2015-05-07) to avoid
overriding CMAKE_GENERATOR_RC.  The MinGW and MSYS Makefiles
generators use it to select a windres next to the compiler even
if it is not in the PATH.
---
 Modules/Platform/Windows-GNU.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index c0d7d8c..b571b16 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -138,7 +138,7 @@ macro(__windows_compiler_gnu lang)
     endforeach()
   endif()
 
-  if(NOT CMAKE_RC_COMPILER_INIT)
+  if(NOT CMAKE_RC_COMPILER_INIT AND NOT CMAKE_GENERATOR_RC)
     set(CMAKE_RC_COMPILER_INIT windres)
   endif()
 
-- 
cgit v0.12