diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 1f79192..e86a453 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -41,7 +41,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: "6.6.*" + version: "6.7.*" cache: true modules: 'qthttpserver qtwebsockets' diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index ec50706..7ae2a22 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -25,16 +25,21 @@ else() install(FILES zone.xiv.novus.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) endif() -set(deploy_tool_options_arg "") -if (WIN32) - set(deploy_tool_options_arg --no-quick-import --no-virtualkeyboard --no-opengl-sw --plugindir "${CMAKE_INSTALL_PREFIX}/bin/bin/plugins" --libdir "${CMAKE_INSTALL_PREFIX}/bin/bin/" --no-translations) -endif() +# Qt 6.7 brings DEPLOY_TOOL_OPTIONS +if(QT_VERSION_MINOR LESS 7) + set(deploy_tool_options_arg "") + if (WIN32) + set(deploy_tool_options_arg --no-quick-import --no-virtualkeyboard --no-opengl-sw --plugindir "${CMAKE_INSTALL_PREFIX}/bin/bin/plugins" --libdir "${CMAKE_INSTALL_PREFIX}/bin/bin/" --no-translations) + endif() -# We only need to call windeployqt on one executable -qt_generate_deploy_app_script( - TARGET novus-launcher - OUTPUT_SCRIPT deploy_script - NO_UNSUPPORTED_PLATFORM_ERROR - DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg} -) -install(SCRIPT ${deploy_script}) + # We only need to call windeployqt on one executable + qt_generate_deploy_app_script( + TARGET novus-launcher + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg} + ) + install(SCRIPT ${deploy_script}) +else() + message(INFO "App deployment requires Qt 6.7") +endif()