diff options
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
-rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 9a2597b..648855c 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -458,8 +458,7 @@ void cmGlobalNinjaGenerator else if(*l == "RC") { // check if mingw is used - const char* cc = mf->GetDefinition("CMAKE_C_COMPILER"); - if(cc && std::string(cc).find("gcc.exe") != std::string::npos) + if(mf->IsOn("CMAKE_COMPILER_IS_MINGW")) { UsingMinGW = true; std::string rc = cmSystemTools::FindProgram("windres"); @@ -467,17 +466,6 @@ void cmGlobalNinjaGenerator rc = "windres.exe";; mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str()); } - else if (cc && std::string(cc).find("cl.exe") != std::string::npos) - { - const char* cmake = mf->GetDefinition("CMAKE_COMMAND"); - std::string bindir = cmake ? cmake : ""; - cmSystemTools::ReplaceString(bindir, "cmake.exe", ""); - std::vector<std::string> locations; - locations.push_back(bindir); - std::string cldeps = cmSystemTools::FindProgram("cmcldeps", locations); - if(!cldeps.empty()) - mf->AddDefinition("CMAKE_CMCLDEPS_EXECUTABLE", cldeps.c_str()); - } } this->cmGlobalGenerator::EnableLanguage(language, mf, optional); this->ResolveLanguageCompiler(*l, mf, optional); |