diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-15 13:05:34 (GMT) |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-15 13:19:15 (GMT) |
| commit | 46546809f5c7c5d0b96902f12f764eebf8cc1d48 (patch) | |
| tree | ede834fb1605b836fabdb9eb7b3d89f81913958b /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 6c1609ea5509b503e6cd740858931ebb5823bf97 (diff) | |
| download | CMake-46546809f5c7c5d0b96902f12f764eebf8cc1d48.zip CMake-46546809f5c7c5d0b96902f12f764eebf8cc1d48.tar.gz CMake-46546809f5c7c5d0b96902f12f764eebf8cc1d48.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 07cc75f..78208e3 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); |