From 46546809f5c7c5d0b96902f12f764eebf8cc1d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Sun, 15 Jul 2012 15:05:34 +0200 Subject: [PATCH] Ninja: windres is also used for cross-compiling It makes no sense to set windres.exe as default, especially when we are on Linux or Unix. --- Source/cmGlobalNinjaGenerator.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 07cc75f39..78208e382 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -475,9 +475,8 @@ void cmGlobalNinjaGenerator { UsingMinGW = true; std::string rc = cmSystemTools::FindProgram("windres"); - if(rc.empty()) - rc = "windres.exe";; - mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str()); + if(!rc.empty()) + mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str()); } } this->cmGlobalGenerator::EnableLanguage(language, mf, optional);