From 59fa0d591946c41e524772a58e2f70c5b52a580f Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Mon, 25 Apr 2022 07:20:25 +0200 Subject: [PATCH] early-access version 2704 --- CMakeLists.txt | 6 ++---- README.md | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index caeb2ab8e..dcd4011a5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,13 +405,11 @@ if (CONAN_REQUIRED_LIBS) # Download conan.cmake automatically, you can also just copy the conan.cmake file if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") - # TODO: Use a tagged release. The latest tagged release does not support VS2022 as of this writing. - file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/43e385830ee35377dbd2dcbe8d5a9e750301ea00/conan.cmake" - "${CMAKE_BINARY_DIR}/conan.cmake") + file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/release/0.18/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake") endif() include(${CMAKE_BINARY_DIR}/conan.cmake) - conan_check(VERSION 1.41.0 REQUIRED) + conan_check(VERSION 1.45.0 REQUIRED) # Manually add iconv to fix a dep conflict between qt and sdl2 # We don't need to add it through find_package or anything since the other two can find it just fine diff --git a/README.md b/README.md index 5c2d4e711..6a0047ffa 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2701. +This is the source code for early-access 2704. ## Legal Notice