yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #8262 from Morph1984/conan 

CMakeLists: Update Conan requirement to 1.45.0
This commit is contained in:
bunnei 2022-04-25 15:19:49 -07:00 committed by GitHub
parent 67569dfe9d 7709374f4f
commit 5295a925d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -405,13 +405,11 @@ if (CONAN_REQUIRED_LIBS)
# Download conan.cmake automatically, you can also just copy the conan.cmake file # Download conan.cmake automatically, you can also just copy the conan.cmake file
if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") 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/release/0.18/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake")
file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/43e385830ee35377dbd2dcbe8d5a9e750301ea00/conan.cmake"
"${CMAKE_BINARY_DIR}/conan.cmake")
endif() endif()
include(${CMAKE_BINARY_DIR}/conan.cmake) 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 # 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 # We don't need to add it through find_package or anything since the other two can find it just fine