summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalMinGWMakefileGenerator.cxx
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2013-03-09 10:16:39 (GMT)
committerPeter Kümmel <syntheticpp@gmx.net>2013-03-09 10:28:45 (GMT)
commit751f712e1ac936afb42acc49f1f19c768d3229b5 (patch)
treeb41dbc18e7804f1c0d63dc1c38bba8a74651482b /Source/cmGlobalMinGWMakefileGenerator.cxx
parent2e80f1076363777718fe3f262f2562b866fc2b35 (diff)
downloadCMake-751f712e1ac936afb42acc49f1f19c768d3229b5.zip
CMake-751f712e1ac936afb42acc49f1f19c768d3229b5.tar.gz
CMake-751f712e1ac936afb42acc49f1f19c768d3229b5.tar.bz2
Ninja: use MinGW generator code in EnableLanguage()
Diffstat (limited to 'Source/cmGlobalMinGWMakefileGenerator.cxx')
-rw-r--r--Source/cmGlobalMinGWMakefileGenerator.cxx28
1 files changed, 1 insertions, 27 deletions
diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx
index e202b02..1f374d3 100644
--- a/Source/cmGlobalMinGWMakefileGenerator.cxx
+++ b/Source/cmGlobalMinGWMakefileGenerator.cxx
@@ -26,33 +26,7 @@ void cmGlobalMinGWMakefileGenerator
cmMakefile *mf,
bool optional)
{
- 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());
+ this->EnableMinGWLanguage(mf);
this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
}