diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-04-25 05:51:11 +0200 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-04-25 05:53:13 +0200 |
commit | 7130bcc46dedca884299144053ec445b2f43f699 (patch) | |
tree | 9738fb9869205fe3d0e97c19192291f4161063d4 | |
parent | Merge pull request #8255 from Morph1984/libressl (diff) | |
download | yuzu-7130bcc46dedca884299144053ec445b2f43f699.tar yuzu-7130bcc46dedca884299144053ec445b2f43f699.tar.gz yuzu-7130bcc46dedca884299144053ec445b2f43f699.tar.bz2 yuzu-7130bcc46dedca884299144053ec445b2f43f699.tar.lz yuzu-7130bcc46dedca884299144053ec445b2f43f699.tar.xz yuzu-7130bcc46dedca884299144053ec445b2f43f699.tar.zst yuzu-7130bcc46dedca884299144053ec445b2f43f699.zip |
-rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index caeb2ab8e..9b1f7a6c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,7 +411,7 @@ if (CONAN_REQUIRED_LIBS) 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 |