mirror of
https://github.com/redstrate/Novus.git
synced 2025-05-19 06:47:44 +00:00
Revert "Require at least 6.7 for qt_generate_deploy_app_script"
This reverts commit 73c374ff29b6a77cb62e419ec251e4d240419a1f.
This commit is contained in:
parent
a13466d3a5
commit
877c6c766e
2 changed files with 13 additions and 18 deletions
2
.github/workflows/cmake-multi-platform.yml
vendored
2
.github/workflows/cmake-multi-platform.yml
vendored
|
@ -41,7 +41,7 @@ jobs:
|
||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
uses: jurplel/install-qt-action@v3
|
uses: jurplel/install-qt-action@v3
|
||||||
with:
|
with:
|
||||||
version: "6.7.*"
|
version: "6.6.*"
|
||||||
cache: true
|
cache: true
|
||||||
modules: 'qthttpserver qtwebsockets'
|
modules: 'qthttpserver qtwebsockets'
|
||||||
|
|
||||||
|
|
|
@ -25,21 +25,16 @@ else()
|
||||||
install(FILES zone.xiv.novus.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps)
|
install(FILES zone.xiv.novus.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Qt 6.7 brings DEPLOY_TOOL_OPTIONS
|
set(deploy_tool_options_arg "")
|
||||||
if(QT_VERSION_MINOR LESS 7)
|
if (WIN32)
|
||||||
set(deploy_tool_options_arg "")
|
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)
|
||||||
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})
|
|
||||||
else()
|
|
||||||
message(INFO "App deployment requires Qt 6.7")
|
|
||||||
endif()
|
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})
|
||||||
|
|
Loading…
Add table
Reference in a new issue