New attempt to fix #6531

This commit is contained in:
Bertrand Songis
2019-07-02 11:54:26 +02:00
parent 0aacc4fe6e
commit 3980980d1b
+2 -1
View File
@@ -394,7 +394,7 @@ elseif(WIN32)
# Qt dlls (using windeployqt)
## Qt translations are already packaged into our custom qrc. Also don't need software rendering engines.
set(wdqtopts --no-translations --no-opengl-sw --no-system-d3d-compiler --no-angle -svg)
set(wdqtopts --no-translations --no-opengl-sw --no-system-d3d-compiler --no-angle --svg)
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set(wdqtopts ${wdqtopts} --release) # release builds aren't always properly detected with mingw
endif()
@@ -404,6 +404,7 @@ elseif(WIN32)
set(wdqtopts ${wdqtopts} -dir "\"${INSTALL_DESTINATION}\"" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/${COMPANION_NAME}.exe" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/${SIMULATOR_NAME}.exe")
# Add installer command to execute windeployqt
message(STATUS windeployqt command: ${QT_BIN_DIR}/windeployqt.exe ${wdqtopts})
install(CODE "execute_process(COMMAND \"${QT_BIN_DIR}/windeployqt.exe\" ${wdqtopts})")
# SDL dll