kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ninja-mingw-windres'

Browse Source 
c864103 Ninja: path is already declared
6547f36 Ninja: more searching for windres
78588e0 Ninja: there could be null pointers
0c89c10 Ninja: search for windres with prefix
4654680 Ninja: windres is also used for cross-compiling
This commit is contained in:
David Cole 2012-07-24 17:01:57 -04:00 committed by CMake Topic Stage
commit 2b3a0dbeff
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/cmGlobalNinjaGenerator.cxx
View File

@ -474,10 +474,33 @@ void cmGlobalNinjaGenerator
if(mf->IsOn("CMAKE_COMPILER_IS_MINGW")) if(mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
{ {
UsingMinGW = true; UsingMinGW = true;
std::string rc = cmSystemTools::FindProgram("windres"); if(!mf->GetDefinition("CMAKE_RC_COMPILER"))
if(rc.empty()) {
rc = "windres.exe";; std::string windres = cmSystemTools::FindProgram("windres");
mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str()); if(windres.empty())
{
std::string compiler_path;
std::string::size_type prefix = std::string::npos;
if (mf->GetDefinition("CMAKE_C_COMPILER"))
{
compiler_path = mf->GetDefinition("CMAKE_C_COMPILER");
prefix = compiler_path.rfind("gcc");
}
else if (mf->GetDefinition("CMAKE_CXX_COMPILER"))
{
compiler_path = mf->GetDefinition("CMAKE_CXX_COMPILER");
prefix = compiler_path.rfind("++");
prefix--;
}
if (prefix != std::string::npos)
{
windres = compiler_path.substr(0, prefix) + "windres";
windres = cmSystemTools::FindProgram(windres.c_str());
}
}
if(!windres.empty())
mf->AddDefinition("CMAKE_RC_COMPILER", windres.c_str());
}
} }
} }
this->cmGlobalGenerator::EnableLanguage(language, mf, optional); this->cmGlobalGenerator::EnableLanguage(language, mf, optional);