diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-11 13:00:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-11 13:00:25 (GMT) |
| commit | cf8ce7a39e425aa5ea6a4847f512b8e8628af61a (patch) | |
| tree | 863b52c6d1ab5d2e247d84e3b0d4374be8aa52ba /Modules | |
| parent | ca658a456f80febe05e57bfae8448c8646960ddf (diff) | |
| download | CMake-cf8ce7a39e425aa5ea6a4847f512b8e8628af61a.zip CMake-cf8ce7a39e425aa5ea6a4847f512b8e8628af61a.tar.gz CMake-cf8ce7a39e425aa5ea6a4847f512b8e8628af61a.tar.bz2 | |
RC: Do not override MinGW Makefiles generator preference
Update logic added in commit 957c2aac (RC: Simplify selection of
resource compiler based on C/C++ toolchain, 2015-05-07) to avoid
overriding CMAKE_GENERATOR_RC. The MinGW and MSYS Makefiles
generators use it to select a windres next to the compiler even
if it is not in the PATH.
Diffstat (limited to 'Modules')
| -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 c0d7d8c..b571b16 100644 --- a/Modules/Platform/Windows-GNU.cmake +++ b/Modules/Platform/Windows-GNU.cmake @@ -138,7 +138,7 @@ macro(__windows_compiler_gnu lang) endforeach() endif() - if(NOT CMAKE_RC_COMPILER_INIT) + if(NOT CMAKE_RC_COMPILER_INIT AND NOT CMAKE_GENERATOR_RC) set(CMAKE_RC_COMPILER_INIT windres) endif() |