diff options
| author |  Morph | 2022-04-24 23:51:11 -0400 |
|---|---|---|
| committer | Morph | 2022-04-24 23:53:13 -0400 |
| commit | 7130bcc46dedca884299144053ec445b2f43f699 (patch) | |
| tree | 9738fb9869205fe3d0e97c19192291f4161063d4 | |
| parent | Merge pull request #8255 from Morph1984/libressl (diff) | |
| download | yuzu-7130bcc46dedca884299144053ec445b2f43f699.tar.gz yuzu-7130bcc46dedca884299144053ec445b2f43f699.tar.xz yuzu-7130bcc46dedca884299144053ec445b2f43f699.zip | |
CMakeLists: Update Conan requirement to 1.45.0
| -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) | |||
| 411 | endif() | 411 | endif() |
| 412 | include(${CMAKE_BINARY_DIR}/conan.cmake) | 412 | include(${CMAKE_BINARY_DIR}/conan.cmake) |
| 413 | 413 | ||
| 414 | conan_check(VERSION 1.41.0 REQUIRED) | 414 | conan_check(VERSION 1.45.0 REQUIRED) |
| 415 | 415 | ||
| 416 | # Manually add iconv to fix a dep conflict between qt and sdl2 | 416 | # Manually add iconv to fix a dep conflict between qt and sdl2 |
| 417 | # We don't need to add it through find_package or anything since the other two can find it just fine | 417 | # We don't need to add it through find_package or anything since the other two can find it just fine |