diff options
author | Brad King <brad.king@kitware.com> | 2022-11-29 15:06:42 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-29 15:06:52 (GMT) |
commit | 25f6f98eb19d3d4c4bf70b5ea3d68a0554e9f304 (patch) | |
tree | a9d1ef1e3933e2f68f884cb289a65a6757f91223 /Modules/Platform | |
parent | 90907c8ff96ff07f0dafc1f4904d25b1e10f014b (diff) | |
parent | b47092fddb51e2e89fa083af5c15fb6b81f35186 (diff) | |
download | CMake-25f6f98eb19d3d4c4bf70b5ea3d68a0554e9f304.zip CMake-25f6f98eb19d3d4c4bf70b5ea3d68a0554e9f304.tar.gz CMake-25f6f98eb19d3d4c4bf70b5ea3d68a0554e9f304.tar.bz2 |
Merge topic 'mingw-windres' into release-3.25
b47092fddb MinGW: Fix regression when windres is not found
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7964
Diffstat (limited to 'Modules/Platform')
-rw-r--r-- | Modules/Platform/Windows-GNU.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake index bf96e63..088b238 100644 --- a/Modules/Platform/Windows-GNU.cmake +++ b/Modules/Platform/Windows-GNU.cmake @@ -157,7 +157,8 @@ 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 windres) + set(_CMAKE_RC_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}windres windres) + set(_CMAKE_RC_COMPILER_FALLBACK windres) endif() enable_language(RC) |