diff options
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index caeb2ab8e..dcd4011a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -405,13 +405,11 @@ if (CONAN_REQUIRED_LIBS) | |||
| 405 | # Download conan.cmake automatically, you can also just copy the conan.cmake file | 405 | # Download conan.cmake automatically, you can also just copy the conan.cmake file |
| 406 | if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") | 406 | if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") |
| 407 | message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") | 407 | message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") |
| 408 | # TODO: Use a tagged release. The latest tagged release does not support VS2022 as of this writing. | 408 | file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/release/0.18/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake") |
| 409 | file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/43e385830ee35377dbd2dcbe8d5a9e750301ea00/conan.cmake" | ||
| 410 | "${CMAKE_BINARY_DIR}/conan.cmake") | ||
| 411 | endif() | 409 | endif() |
| 412 | include(${CMAKE_BINARY_DIR}/conan.cmake) | 410 | include(${CMAKE_BINARY_DIR}/conan.cmake) |
| 413 | 411 | ||
| 414 | conan_check(VERSION 1.41.0 REQUIRED) | 412 | conan_check(VERSION 1.45.0 REQUIRED) |
| 415 | 413 | ||
| 416 | # Manually add iconv to fix a dep conflict between qt and sdl2 | 414 | # 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 | 415 | # We don't need to add it through find_package or anything since the other two can find it just fine |