mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 10:50:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

MSYS/MinGW Makefiles: Simplify selection of windres as Resource Compiler

Browse Source 
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
This commit is contained in:
Brad King
2022-05-26 13:23:24 -04:00
parent 9019537670
commit 55ba10dcfd
3 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmGlobalMSYSMakefileGenerator.cxx
View File

@@ -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() &&

19
Source/cmGlobalMinGWMakefileGenerator.cxx
View File

@@ -19,25 +19,6 @@ cmGlobalMinGWMakefileGenerator::cmGlobalMinGWMakefileGenerator(cmake* cm)
cm->GetState()->SetMinGWMake(true);
}
void cmGlobalMinGWMakefileGenerator::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;
locations.push_back(cmSystemTools::GetProgramPath(makeProgram));
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("CMAKE_GENERATOR_RC", rc);
this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
}
void cmGlobalMinGWMakefileGenerator::GetDocumentation(
cmDocumentationEntry& entry)
{

7
Source/cmGlobalMinGWMakefileGenerator.h
View File

@@ -36,11 +36,4 @@ public:
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);
/**
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
virtual void EnableLanguage(std::vector<std::string> const& languages,
cmMakefile*, bool optional);
};