diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-15 17:49:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-08-15 17:57:58 (GMT) |
| commit | e9755bc7c1b6e5fd2556e308e4e9f94be2bd698d (patch) | |
| tree | 19d8f89b58c86c373c9360b0ff64deb4b04a6056 /Modules/Platform | |
| parent | 732cad4952e404e86758e0ecba197135c3ae777b (diff) | |
| download | CMake-e9755bc7c1b6e5fd2556e308e4e9f94be2bd698d.zip CMake-e9755bc7c1b6e5fd2556e308e4e9f94be2bd698d.tar.gz CMake-e9755bc7c1b6e5fd2556e308e4e9f94be2bd698d.tar.bz2 | |
MinGW: Restore using windres when toolchain-prefixed name is not available
Since commit 55ba10dcfd (MSYS/MinGW Makefiles: Simplify selection of
windres as Resource Compiler, 2022-05-26, v3.24.0-rc1~82^2) the `MinGW
Makefiles` and `MSYS Makefiles` generators no longer specify the plain
`windres` name for the MinGW resource compiler. Instead, the name is
specified in our MinGW platform information module. After the change in
commit af4adf6aa9 (MinGW: Fix default windres selection when
cross-compiling, 2020-03-25, v3.18.0-rc1~492^2), when cross-compiling,
we only specify the toolchain-prefixed name of the tool, which may not
be available in all environments.
If the toolchain-prefixed name is not available, fall back to the plain
`windres` name. We already use this approach for other binutils.
Fixes: #23841
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Windows-GNU.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake index b464169..bf96e63 100644 --- a/Modules/Platform/Windows-GNU.cmake +++ b/Modules/Platform/Windows-GNU.cmake @@ -157,7 +157,7 @@ macro(__windows_compiler_gnu lang) endif() if(NOT CMAKE_RC_COMPILER_INIT AND NOT CMAKE_GENERATOR_RC) - set(CMAKE_RC_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}windres) + set(CMAKE_RC_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}windres windres) endif() enable_language(RC) |