Commit e3a1f727 authored by Peter Kuemmel's avatar Peter Kuemmel

Ninja: find mingw's resource compiler

parent c60557e9
...@@ -434,16 +434,19 @@ void cmGlobalNinjaGenerator ...@@ -434,16 +434,19 @@ void cmGlobalNinjaGenerator
cmMakefile *mf, cmMakefile *mf,
bool optional) bool optional)
{ {
this->cmGlobalGenerator::EnableLanguage(languages, mf, optional);
std::string path; std::string path;
for(std::vector<std::string>::const_iterator l = languages.begin(); for(std::vector<std::string>::const_iterator l = languages.begin();
l != languages.end(); ++l) l != languages.end(); ++l)
{ {
std::vector<std::string> language;
language.push_back(*l);
if(*l == "NONE") if(*l == "NONE")
{ {
this->cmGlobalGenerator::EnableLanguage(language, mf, optional);
continue; continue;
} }
if(*l == "Fortran") else if(*l == "Fortran")
{ {
std::string message = "The \""; std::string message = "The \"";
message += this->GetName(); message += this->GetName();
...@@ -452,15 +455,22 @@ void cmGlobalNinjaGenerator ...@@ -452,15 +455,22 @@ void cmGlobalNinjaGenerator
message += "\" yet."; message += "\" yet.";
cmSystemTools::Error(message.c_str()); cmSystemTools::Error(message.c_str());
} }
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)
{
UsingMinGW = true;
std::string rc = cmSystemTools::FindProgram("windres");
if(rc.empty())
rc = "windres.exe";;
mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str());
}
}
this->cmGlobalGenerator::EnableLanguage(language, mf, optional);
this->ResolveLanguageCompiler(*l, mf, optional); this->ResolveLanguageCompiler(*l, mf, optional);
} }
// check for mingw
const char* cc = mf->GetDefinition("CMAKE_C_COMPILER");
if(cc && std::string(cc).find("gcc.exe") != std::string::npos)
{
UsingMinGW = true;
}
} }
bool cmGlobalNinjaGenerator::UsingMinGW = false; bool cmGlobalNinjaGenerator::UsingMinGW = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment