diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-26 17:23:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-05-26 17:26:54 (GMT) |
| commit | 55ba10dcfdfb1f69b81284810aa6f07dc1527ccb (patch) | |
| tree | 03873782af66ccd87052a6887064161fbc886ad5 /Source/cmGlobalMSYSMakefileGenerator.cxx | |
| parent | 9019537670003d8d35b6d838c7b22a751b4119b2 (diff) | |
| download | CMake-55ba10dcfdfb1f69b81284810aa6f07dc1527ccb.zip CMake-55ba10dcfdfb1f69b81284810aa6f07dc1527ccb.tar.gz CMake-55ba10dcfdfb1f69b81284810aa6f07dc1527ccb.tar.bz2 | |
MSYS/MinGW Makefiles: Simplify selection of windres as Resource Compiler
Since commit 957c2aac7f (RC: Simplify selection of resource compiler
based on C/C++ toolchain, 2015-05-07, v3.3.0-rc1~101^2~3), `windres` is
selected automatically when using compilers that target the GNU ABI.
Drop the generator-specific preference to make behavior more consistent
with the Ninja generator.
Issue: #23542
Diffstat (limited to 'Source/cmGlobalMSYSMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalMSYSMakefileGenerator.cxx | 15 |
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() && |