diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-16 15:14:42 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-12-16 15:14:42 (GMT) |
| commit | c6c82f9e3e921a3988a2e8b4012e3942fa22db40 (patch) | |
| tree | fc81aa34c346fe82ffc4781c4884012025dbc8df /Modules | |
| parent | 037616f194f72b3563edd0c5b5c028694b2fcb50 (diff) | |
| parent | 6ddb1e5b9a3eff941ad12d29609839871fe518ed (diff) | |
| download | CMake-c6c82f9e3e921a3988a2e8b4012e3942fa22db40.zip CMake-c6c82f9e3e921a3988a2e8b4012e3942fa22db40.tar.gz CMake-c6c82f9e3e921a3988a2e8b4012e3942fa22db40.tar.bz2 | |
Merge topic 'fix-12480-correct-windres-compiler-when-cross-compiling'
6ddb1e5 Modules: Use "windres" as rc compiler base name for cross-compiles (#12480)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeRCInformation.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake index fcd0099..859fe11 100644 --- a/Modules/CMakeRCInformation.cmake +++ b/Modules/CMakeRCInformation.cmake @@ -20,6 +20,9 @@ # make sure we don't use CMAKE_BASE_NAME from somewhere else SET(CMAKE_BASE_NAME) GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE) +IF("${CMAKE_BASE_NAME}" MATCHES "windres") + SET(CMAKE_BASE_NAME "windres") +ENDIF() SET(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) |