Merge topic 'fix-12480-correct-windres-compiler-when-cross-compiling'
6ddb1e5
Modules: Use "windres" as rc compiler base name for cross-compiles (#12480)
This commit is contained in:
commit
c6c82f9e3e
|
@ -20,6 +20,9 @@
|
||||||
# make sure we don't use CMAKE_BASE_NAME from somewhere else
|
# make sure we don't use CMAKE_BASE_NAME from somewhere else
|
||||||
SET(CMAKE_BASE_NAME)
|
SET(CMAKE_BASE_NAME)
|
||||||
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE)
|
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
|
SET(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE
|
||||||
${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
|
${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
|
||||||
INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
|
INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
|
||||||
|
|
Loading…
Reference in New Issue