summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-10-03 04:58:49 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-10-03 04:58:49 +0200
commitb848cc5c3f787745bd57e4e6f2e66253b5e87f1b (patch)
treeef9ecfbdf6ba0e213669205d20b5b6150231d2c3 /CMakeLists.txt
parentCMakeModules: Add Qt5QmlModel (diff)
downloadyuzu-b848cc5c3f787745bd57e4e6f2e66253b5e87f1b.tar
yuzu-b848cc5c3f787745bd57e4e6f2e66253b5e87f1b.tar.gz
yuzu-b848cc5c3f787745bd57e4e6f2e66253b5e87f1b.tar.bz2
yuzu-b848cc5c3f787745bd57e4e6f2e66253b5e87f1b.tar.lz
yuzu-b848cc5c3f787745bd57e4e6f2e66253b5e87f1b.tar.xz
yuzu-b848cc5c3f787745bd57e4e6f2e66253b5e87f1b.tar.zst
yuzu-b848cc5c3f787745bd57e4e6f2e66253b5e87f1b.zip
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd0f6b978..123a3082a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,7 +237,7 @@ yuzu_find_packages()
# Qt5 requires that we find components, so it doesn't fit our pretty little find package function
if(ENABLE_QT)
- set(QT_VERSION 5.12)
+ set(QT_VERSION 5.15)
# We want to load the generated conan qt config so that we get the QT_ROOT var so that we can use the official
# Qt5Config inside the root folder instead of the conan generated one.
if(EXISTS ${CMAKE_BINARY_DIR}/qtConfig.cmake)
@@ -339,8 +339,8 @@ if(ENABLE_QT)
set(QT_PREFIX_HINT)
if(YUZU_USE_BUNDLED_QT)
- if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
- set(QT_BUILD qt-5.12.8-msvc2017_64)
+ if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
+ set(QT_BUILD qt-5.15.2-msvc2019_64)
elseif ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND NOT MINGW AND ARCHITECTURE_x86_64)
set(QT_BUILD qt5_5_15_2)
else()
@@ -369,7 +369,7 @@ endif()
if (ENABLE_SDL2)
if (YUZU_USE_BUNDLED_SDL2)
# Detect toolchain and platform
- if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
+ if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
set(SDL2_VER "SDL2-2.0.16")
else()
message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")
@@ -462,7 +462,7 @@ if (CONAN_REQUIRED_LIBS)
if(ENABLE_QT)
list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}")
list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}")
- find_package(Qt5 5.12 REQUIRED COMPONENTS Widgets)
+ find_package(Qt5 5.15 REQUIRED COMPONENTS Widgets)
if (YUZU_USE_QT_WEB_ENGINE)
find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets)
endif()