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

Ninja: use MinGW generator code in EnableLanguage()

This commit is contained in:
Peter Kümmel 2013-03-09 11:16:39 +01:00
parent 2e80f10763
commit 751f712e1a
4 changed files with 38 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/cmGlobalGenerator.cxx
View File

@ -2081,6 +2081,38 @@ bool cmGlobalGenerator::UseFolderProperty()
return false; return false;
} }
//----------------------------------------------------------------------------
void cmGlobalGenerator::EnableMinGWLanguage(cmMakefile *mf)
{
this->FindMakeProgram(mf);
std::string makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
std::vector<std::string> locations;
locations.push_back(cmSystemTools::GetProgramPath(makeProgram.c_str()));
locations.push_back("/mingw/bin");
locations.push_back("c:/mingw/bin");
std::string tgcc = cmSystemTools::FindProgram("gcc", locations);
std::string gcc = "gcc.exe";
if(tgcc.size())
{
gcc = tgcc;
}
std::string tgxx = cmSystemTools::FindProgram("g++", locations);
std::string gxx = "g++.exe";
if(tgxx.size())
{
gxx = tgxx;
}
std::string trc = cmSystemTools::FindProgram("windres", locations);
std::string rc = "windres.exe";
if(trc.size())
{
rc = trc;
}
mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str());
mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str());
mf->AddDefinition("CMAKE_GENERATOR_RC", rc.c_str());
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmTarget cmGlobalGenerator::CreateGlobalTarget( cmTarget cmGlobalGenerator::CreateGlobalTarget(
const char* name, const char* message, const char* name, const char* message,

1
Source/cmGlobalGenerator.h
View File

@ -340,6 +340,7 @@ protected:
virtual const char* GetPredefinedTargetsFolder(); virtual const char* GetPredefinedTargetsFolder();
virtual bool UseFolderProperty(); virtual bool UseFolderProperty();
void EnableMinGWLanguage(cmMakefile *mf);
private: private:
cmMakefile* TryCompileOuterMakefile; cmMakefile* TryCompileOuterMakefile;

28
Source/cmGlobalMinGWMakefileGenerator.cxx
View File

@ -26,33 +26,7 @@ void cmGlobalMinGWMakefileGenerator
cmMakefile *mf, cmMakefile *mf,
bool optional) bool optional)
{ {
this->FindMakeProgram(mf); this->EnableMinGWLanguage(mf);
std::string makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
std::vector<std::string> locations;
locations.push_back(cmSystemTools::GetProgramPath(makeProgram.c_str()));
locations.push_back("/mingw/bin");
locations.push_back("c:/mingw/bin");
std::string tgcc = cmSystemTools::FindProgram("gcc", locations);
std::string gcc = "gcc.exe";
if(tgcc.size())
{
gcc = tgcc;
}
std::string tgxx = cmSystemTools::FindProgram("g++", locations);
std::string gxx = "g++.exe";
if(tgxx.size())
{
gxx = tgxx;
}
std::string trc = cmSystemTools::FindProgram("windres", locations);
std::string rc = "windres.exe";
if(trc.size())
{
rc = trc;
}
mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str());
mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str());
mf->AddDefinition("CMAKE_GENERATOR_RC", rc.c_str());
this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
} }

61
Source/cmGlobalNinjaGenerator.cxx
View File

@ -495,65 +495,12 @@ void cmGlobalNinjaGenerator
cmMakefile *mf, cmMakefile *mf,
bool optional) bool optional)
{ {
std::string path; if(mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
for(std::vector<std::string>::const_iterator l = languages.begin();
l != languages.end(); ++l)
{ {
std::vector<std::string> language; UsingMinGW = true;
language.push_back(*l); this->EnableMinGWLanguage(mf);
if(*l == "NONE")
{
this->cmGlobalGenerator::EnableLanguage(language, mf, optional);
continue;
}
else if(*l == "Fortran")
{
std::string message = "The \"";
message += this->GetName();
message += "\" generator does not support the language \"";
message += *l;
message += "\" yet.";
cmSystemTools::Error(message.c_str());
}
else if(*l == "RC")
{
// check if mingw is used
if(mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
{
UsingMinGW = true;
if(!mf->GetDefinition("CMAKE_RC_COMPILER"))
{
std::string windres = cmSystemTools::FindProgram("windres");
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->ResolveLanguageCompiler(*l, mf, optional);
} }
this->cmGlobalGenerator::EnableLanguage(languages, mf, optional);
} }
bool cmGlobalNinjaGenerator::UsingMinGW = false; bool cmGlobalNinjaGenerator::UsingMinGW = false;