diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-26 13:06:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-26 13:06:13 (GMT) |
| commit | 545875bebe8faec350dbe23bbae58eb6c17e6524 (patch) | |
| tree | 4d108dd35bcf3ee3f512f7e87661c3be9fb59e44 /Modules | |
| parent | 66e0b312c0985493adeeda63d1dc7815cc0fe364 (diff) | |
| parent | af4adf6aa9dd86d8ebb7d24590c1101f3a195ec8 (diff) | |
| download | CMake-545875bebe8faec350dbe23bbae58eb6c17e6524.zip CMake-545875bebe8faec350dbe23bbae58eb6c17e6524.tar.gz CMake-545875bebe8faec350dbe23bbae58eb6c17e6524.tar.bz2 | |
Merge topic 'mingw-windres-cross-compile'
af4adf6aa9 MinGW: Fix default windres selection when cross-compiling
0251ddadab MinGW: Drop unnecessary windres selection code with Unix Makefiles
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4520
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-GNU.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake index 38a8cf4..5f1923c 100644 --- a/Modules/Platform/Windows-GNU.cmake +++ b/Modules/Platform/Windows-GNU.cmake @@ -47,10 +47,6 @@ if("${_help}" MATCHES "GNU ld .* 2\\.1[1-6]") set(__WINDOWS_GNU_LD_RESPONSE 0) endif() -if(NOT CMAKE_GENERATOR_RC AND CMAKE_GENERATOR MATCHES "Unix Makefiles") - set(CMAKE_GENERATOR_RC windres) -endif() - macro(__windows_compiler_gnu lang) if(MSYS OR MINGW) @@ -132,7 +128,7 @@ macro(__windows_compiler_gnu lang) endif() if(NOT CMAKE_RC_COMPILER_INIT AND NOT CMAKE_GENERATOR_RC) - set(CMAKE_RC_COMPILER_INIT windres) + set(CMAKE_RC_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}windres) endif() enable_language(RC) |