diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-16 16:43:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-16 16:43:52 (GMT) |
| commit | d83505b36493da96faf5cb1abba1ca2efded83e6 (patch) | |
| tree | 66d672c13ff9452c78c94225d3164aff641e0fea | |
| parent | 349071d6ab3557165f111aa6f0694e252a7f1b81 (diff) | |
| parent | e9755bc7c1b6e5fd2556e308e4e9f94be2bd698d (diff) | |
| download | CMake-d83505b36493da96faf5cb1abba1ca2efded83e6.zip CMake-d83505b36493da96faf5cb1abba1ca2efded83e6.tar.gz CMake-d83505b36493da96faf5cb1abba1ca2efded83e6.tar.bz2 | |
Merge topic 'mingw-windres' into release-3.24
e9755bc7c1 MinGW: Restore using windres when toolchain-prefixed name is not available
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7574
| -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) |