diff options
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 123a3082a..eb403205c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -411,12 +411,13 @@ if (CONAN_REQUIRED_LIBS) | |||
| 411 | # Download conan.cmake automatically, you can also just copy the conan.cmake file | 411 | # Download conan.cmake automatically, you can also just copy the conan.cmake file |
| 412 | if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") | 412 | if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") |
| 413 | message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") | 413 | message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") |
| 414 | file(DOWNLOAD "https://github.com/conan-io/cmake-conan/raw/v0.15/conan.cmake" | 414 | # TODO: Use a tagged release. The latest tagged release does not support VS2022 as of this writing. |
| 415 | file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/43e385830ee35377dbd2dcbe8d5a9e750301ea00/conan.cmake" | ||
| 415 | "${CMAKE_BINARY_DIR}/conan.cmake") | 416 | "${CMAKE_BINARY_DIR}/conan.cmake") |
| 416 | endif() | 417 | endif() |
| 417 | include(${CMAKE_BINARY_DIR}/conan.cmake) | 418 | include(${CMAKE_BINARY_DIR}/conan.cmake) |
| 418 | 419 | ||
| 419 | conan_check(VERSION 1.24.0 REQUIRED) | 420 | conan_check(VERSION 1.41.0 REQUIRED) |
| 420 | 421 | ||
| 421 | # Manually add iconv to fix a dep conflict between qt and sdl2 | 422 | # Manually add iconv to fix a dep conflict between qt and sdl2 |
| 422 | # We don't need to add it through find_package or anything since the other two can find it just fine | 423 | # We don't need to add it through find_package or anything since the other two can find it just fine |