summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalMSYSMakefileGenerator.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmGlobalMSYSMakefileGenerator.cxx')
-rw-r--r--Source/cmGlobalMSYSMakefileGenerator.cxx15
1 files changed, 0 insertions, 15 deletions
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx
index cb63110..d4ff1e0 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.cxx
+++ b/Source/cmGlobalMSYSMakefileGenerator.cxx
@@ -42,22 +42,7 @@ std::string cmGlobalMSYSMakefileGenerator::FindMinGW(
void cmGlobalMSYSMakefileGenerator::EnableLanguage(
std::vector<std::string> const& l, cmMakefile* mf, bool optional)
{
- this->FindMakeProgram(mf);
- const std::string& makeProgram =
- mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
- std::vector<std::string> locations;
- std::string makeloc = cmSystemTools::GetProgramPath(makeProgram);
- locations.push_back(this->FindMinGW(makeloc));
- locations.push_back(makeloc);
- locations.push_back("/mingw/bin");
- locations.push_back("c:/mingw/bin");
- std::string trc = cmSystemTools::FindProgram("windres", locations);
- std::string rc = "windres.exe";
- if (!trc.empty()) {
- rc = trc;
- }
mf->AddDefinition("MSYS", "1");
- mf->AddDefinition("CMAKE_GENERATOR_RC", rc);
this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
if (!mf->IsSet("CMAKE_AR") && !this->CMakeInstance->GetIsInTryCompile() &&