diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index e8a3612a8..fbcb51c04 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -90,8 +90,8 @@ def presetSlugs = [ def presetFlags = [ 'Regular': '-t --preset=regular -D CMAKE_BUILD_TYPE=Release', - 'Debug': '--preset=debug -D CMAKE_BUILD_TYPE=Debug', - 'Dev': '--preset=experimental -D CMAKE_BUILD_TYPE=Debug -D VNC=OFF' + 'Debug': '--preset=debug -D CMAKE_BUILD_TYPE=Debug -D STATIC_BUILD=OFF', + 'Dev': '--preset=experimental -D CMAKE_BUILD_TYPE=Debug -D VNC=OFF -D STATIC_BUILD=OFF' ] def gitClone(repository, branch) { diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt index 6b4c7a7ca..b9d0e40e9 100644 --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -240,12 +240,24 @@ if(WIN32) # needed for static builds qt_import_plugins(plat INCLUDE Qt${QT_MAJOR}::QWindowsIntegrationPlugin Qt${QT_MAJOR}::QICOPlugin Qt${QT_MAJOR}::QWindowsVistaStylePlugin) else() - install(CODE " - get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE) - execute_process( - COMMAND $ - \"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/$\") - ") + if(USE_QT6) + install(CODE " + get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE) + execute_process( + COMMAND $ + \"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/$\") + ") + else() + find_program(WINDEPLOYQT_EXECUTABLE windeployqt) + if(WINDEPLOYQT_EXECUTABLE) + install(CODE " + get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE) + execute_process( + COMMAND ${WINDEPLOYQT_EXECUTABLE} + \"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/$\") + ") + endif() + endif() endif() endif()