diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-09-12 15:54:05 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-09-12 15:54:05 -0500 |
| commit | 24d8360da10424a6cd30ef919e93ecfda56b54de (patch) | |
| tree | d0c12cce825308f6b37dcb2e2f75bc5eafb89cc6 /src | |
| parent | f75d988437631b589d7537051f97614184e8123d (diff) | |
| parent | c41e3d8e7ae657a30a9c16894778f0e54351f7cb (diff) | |
| download | monzero-gui-24d8360da10424a6cd30ef919e93ecfda56b54de.tar.gz monzero-gui-24d8360da10424a6cd30ef919e93ecfda56b54de.tar.xz monzero-gui-24d8360da10424a6cd30ef919e93ecfda56b54de.zip | |
Merge pull request #3076
c41e3d8 cmake: cross-compilation to Windows - find MinGW prefixed windres (xiphon)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0eeb4e43..279f73ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -79,7 +79,8 @@ if(MINGW) set(ICON_RC ${CMAKE_CURRENT_BINARY_DIR}/icon.rc) set(ICON_RES ${CMAKE_CURRENT_BINARY_DIR}/icon.o) file(WRITE ${ICON_RC} "IDI_ICON1 ICON DISCARDABLE \"${ICON}\"") - add_custom_command(OUTPUT ${ICON_RES} COMMAND windres ${ICON_RC} ${ICON_RES} MAIN_DEPENDENCY ${ICON_RC}) + find_program(Qt5_WINDRES_EXECUTABLE NAMES windres x86_64-w64-mingw32-windres REQUIRED CMAKE_FIND_ROOT_PATH_BOTH) + add_custom_command(OUTPUT ${ICON_RES} COMMAND ${Qt5_WINDRES_EXECUTABLE} ${ICON_RC} ${ICON_RES} MAIN_DEPENDENCY ${ICON_RC}) list(APPEND RESOURCES ${ICON_RES}) endif() |