GerbilSoft/rvthtool
1
Fork 0
mirror of https://github.com/GerbilSoft/rvthtool.git synced 2025-06-18 11:35:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

[qrvthtool] CmakeLists.txt: Update the windeployqt exclusions to work with Qt 5.15.

Browse Source 
Exclude Qt ANGLE, and make sure ffmpeg and WebKit2 are excluded.
The last two are "just in case", since I didn't see those installed
in my testing, though Qt ANGLE was definitely installed in qt5.
(Note that ffmpeg is a qt6 option.)
This commit is contained in:
David Korth 2025-06-16 22:16:13 -04:00
parent 56d20b41b8
commit ef6645c559
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qrvthtool/CMakeLists.txt
View File

@ -425,14 +425,28 @@ ENDIF(DIR_INSTALL_XDG_APPSTREAM)
INCLUDE(qt_windeploy.cmake)
IF(TARGET ${QT_NS}::windeployqt)
# execute windeployqt in a tmp directory after build
# NOTE: Some options are only available in Qt6.
IF(OUR_QT_VERSION GREATER 5) # >= 6
SET(QTWINDEPLOY_NO_SYSTEM_DXC_COMPILER "--no-system-dxc-compiler")
SET(QTWINDEPLOY_EXCLUDE_PLUGINS "--exclude-plugins qcertonlybackend,qschannelbackend,qtuiotouchplugin,qdirect2d,qminimal,qoffscreen,qgif,qico,qjpeg,qnetworklistmanager")
SET(QTWINDEPLOY_NO_FFMPEG "--no-ffmpeg")
ELSE(OUR_QT_VERSION GREATER 5) # <= 5
SET(QTWINDEPLOY_NO_WEBKIT2 "--no-webkit2")
SET(QTWINDEPLOY_NO_ANGLE "--no-angle")
ENDIF(OUR_QT_VERSION GREATER 5)
ADD_CUSTOM_COMMAND(TARGET qrvthtool POST_BUILD
COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/windeployqt"
COMMAND set PATH=%PATH%$<SEMICOLON>${qt_install_prefix}/bin
COMMAND ${QT_NS}::windeployqt ${WINDEPLOY_NO_SVG}
--no-system-d3d-compiler
--no-system-dxc-compiler
${QTWINDEPLOY_NO_SYSTEM_DXC_COMPILER}
--no-compiler-runtime
--exclude-plugins qcertonlybackend,qschannelbackend,qtuiotouchplugin,qdirect2d,qminimal,qoffscreen,qgif,qico,qjpeg,qnetworklistmanager
${QTWINDEPLOY_EXCLUDE_PLUGINS}
${QTWINDEPLOY_NO_WEBKIT2}
${QTWINDEPLOY_NO_ANGLE}
--no-opengl-sw
${QTWINDEPLOY_NO_FFMPEG}
--dir "${CMAKE_CURRENT_BINARY_DIR}/windeployqt"
"$<TARGET_FILE_DIR:qrvthtool>/$<TARGET_FILE_NAME:qrvthtool>"
)