From 3980980d1bd431fe5ca3b1ff7ae44f366dce0971 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 2 Jul 2019 11:54:26 +0200 Subject: [PATCH] New attempt to fix #6531 --- companion/src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index d24e653f1..892e84e5c 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -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