From 0c89c10cfcd9bdd11531e3680216235f5b34ac8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Sun, 15 Jul 2012 16:03:22 +0200
Subject: [PATCH] Ninja: search for windres with prefix

---
 Source/cmGlobalNinjaGenerator.cxx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 78208e382..3c97afcc9 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -474,9 +474,17 @@ void cmGlobalNinjaGenerator
       if(mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
         {
         UsingMinGW = true;
-        std::string rc = cmSystemTools::FindProgram("windres");
-        if(!rc.empty())
-          mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str());
+        if(!mf->GetDefinition("CMAKE_RC_COMPILER"))
+          {
+          std::string windres = "windres";
+          std::string gcc = mf->GetRequiredDefinition("CMAKE_C_COMPILER");
+          std::string::size_type prefix = gcc.rfind("gcc");
+          if (prefix != std::string::npos)
+            windres.insert(0, gcc.substr(0, prefix));
+          windres = cmSystemTools::FindProgram(windres.c_str());
+          if(!windres.empty())
+            mf->AddDefinition("CMAKE_RC_COMPILER", windres.c_str());
+          }
         }
       }
     this->cmGlobalGenerator::EnableLanguage(language, mf, optional);