summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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()
237 237
238# Qt5 requires that we find components, so it doesn't fit our pretty little find package function 238# Qt5 requires that we find components, so it doesn't fit our pretty little find package function
239if(ENABLE_QT) 239if(ENABLE_QT)
240 set(QT_VERSION 5.12) 240 set(QT_VERSION 5.15)
241 # We want to load the generated conan qt config so that we get the QT_ROOT var so that we can use the official 241 # We want to load the generated conan qt config so that we get the QT_ROOT var so that we can use the official
242 # Qt5Config inside the root folder instead of the conan generated one. 242 # Qt5Config inside the root folder instead of the conan generated one.
243 if(EXISTS ${CMAKE_BINARY_DIR}/qtConfig.cmake) 243 if(EXISTS ${CMAKE_BINARY_DIR}/qtConfig.cmake)
@@ -339,8 +339,8 @@ if(ENABLE_QT)
339 set(QT_PREFIX_HINT) 339 set(QT_PREFIX_HINT)
340 340
341 if(YUZU_USE_BUNDLED_QT) 341 if(YUZU_USE_BUNDLED_QT)
342 if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) 342 if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
343 set(QT_BUILD qt-5.12.8-msvc2017_64) 343 set(QT_BUILD qt-5.15.2-msvc2019_64)
344 elseif ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND NOT MINGW AND ARCHITECTURE_x86_64) 344 elseif ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND NOT MINGW AND ARCHITECTURE_x86_64)
345 set(QT_BUILD qt5_5_15_2) 345 set(QT_BUILD qt5_5_15_2)
346 else() 346 else()
@@ -369,7 +369,7 @@ endif()
369if (ENABLE_SDL2) 369if (ENABLE_SDL2)
370 if (YUZU_USE_BUNDLED_SDL2) 370 if (YUZU_USE_BUNDLED_SDL2)
371 # Detect toolchain and platform 371 # Detect toolchain and platform
372 if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) 372 if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
373 set(SDL2_VER "SDL2-2.0.16") 373 set(SDL2_VER "SDL2-2.0.16")
374 else() 374 else()
375 message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") 375 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)
462 if(ENABLE_QT) 462 if(ENABLE_QT)
463 list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}") 463 list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}")
464 list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}") 464 list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}")
465 find_package(Qt5 5.12 REQUIRED COMPONENTS Widgets) 465 find_package(Qt5 5.15 REQUIRED COMPONENTS Widgets)
466 if (YUZU_USE_QT_WEB_ENGINE) 466 if (YUZU_USE_QT_WEB_ENGINE)
467 find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets) 467 find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets)
468 endif() 468 endif()