[cmake] Fix QuaZip once and for all #71

Merged
Maufeat merged 6 commits from fix/quazip-v999999999 into master 2025-07-16 23:17:35 +02:00
2 changed files with 19 additions and 1 deletions
Showing only changes of commit 382bbfbeba - Show all commits

View file

@ -79,6 +79,8 @@ option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
CMAKE_DEPENDENT_OPTION(YUZU_QT_MIRROR "What mirror to use for when downloading bundled Qt" "" "YUZU_USE_BUNDLED_QT" "")
option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)

View file

@ -133,7 +133,23 @@ function(download_qt_configuration prefix_out target host type arch arch_path ba
set(install_args ${install_args} install-tool --outputdir ${base_path} ${host} desktop ${target})
else()
set(prefix "${base_path}/${target}/${arch_path}")
set(install_args ${install_args} install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch} -m qt3d qt5compat qtactiveqt qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning qtquick3d qtquick3dphysics qtquickeffectmaker qtquicktimeline qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtshadertools qtspeech qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview)
set(install_args ${install_args} install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch})
if (YUZU_USE_QT_MULTIMEDIA OR YUZU_USE_QT_WEB_ENGINE)
set(install_args ${install_args} -m)
endif()
if (YUZU_USE_QT_MULTIMEDIA)
set(install_args ${install_args} qtmultimedia)
endif()
if (YUZU_USE_QT_WEB_ENGINE)
set(install_args ${install_args} qtpositioning qtwebchannel qtwebengine)
endif()
if (NOT "${YUZU_QT_MIRROR}" STREQUAL "")
set(install_args ${install_args} -b ${YUZU_QT_MIRROR})
endif()
endif()
if (NOT EXISTS "${prefix}")