diff options
| author | bunnei <bunneidev@gmail.com> | 2022-04-25 15:19:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 15:19:49 -0700 |
| commit | ba720f0ded6f68dcd604b0ec480ea52d69efca6a (patch) | |
| tree | db49bab15171666a946f69b9d6b42f0f99fd89f3 | |
| parent | 483e68b0e7efb1f5be71b6030ec1e4dbd49b5c95 (diff) | |
| parent | 0f322a0c7ac6910b86623afc34781725ca4cd813 (diff) | |
Merge pull request #8262 from Morph1984/conan
CMakeLists: Update Conan requirement to 1.45.0
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index caeb2ab8ef..dcd4011a52 100644 --- 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 |