diff --git a/CMakeLists.txt b/CMakeLists.txt index 32d446bfa3..3845316162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ 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 downloading the bundled Qt" "" "YUZU_USE_BUNDLED_QT" "") +set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries") option(ENABLE_CUBEB "Enables the cubeb audio backend" ON) diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index a2bae8d3eb..b354ccfbe3 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -94,7 +94,7 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_out else() set(host "linux") set(type "desktop") - set(arch "gcc_64") + set(arch "linux_gcc_64") set(arch_path "linux") endif() @@ -143,14 +143,16 @@ function(download_qt_configuration prefix_out target host type arch arch_path ba set(install_args ${install_args} qtpositioning qtwebchannel qtwebengine) endif() - if (NOT "${YUZU_QT_MIRROR}" STREQUAL "") + if (NOT ${YUZU_QT_MIRROR} STREQUAL "") + message(STATUS "Using Qt mirror ${YUZU_QT_MIRROR}") set(install_args ${install_args} -b ${YUZU_QT_MIRROR}) endif() endif() + message(STATUS "Install Args ${install_args}") if (NOT EXISTS "${prefix}") message(STATUS "Downloading Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path}") - set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.2.1") + set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.3.0") if (WIN32) set(aqt_path "${base_path}/aqt.exe") if (NOT EXISTS "${aqt_path}")