summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-04-26 00:19:49 +0200
committerGitHub <noreply@github.com>2022-04-26 00:19:49 +0200
commit5295a925d8fd5e0115838fd8f96db4d386d42d4b (patch)
treedb49bab15171666a946f69b9d6b42f0f99fd89f3
parentMerge pull request #8256 from Morph1984/ci-vs-2022 (diff)
parentCMakeLists: Download conan.cmake 0.18.1 (diff)
downloadyuzu-5295a925d8fd5e0115838fd8f96db4d386d42d4b.tar
yuzu-5295a925d8fd5e0115838fd8f96db4d386d42d4b.tar.gz
yuzu-5295a925d8fd5e0115838fd8f96db4d386d42d4b.tar.bz2
yuzu-5295a925d8fd5e0115838fd8f96db4d386d42d4b.tar.lz
yuzu-5295a925d8fd5e0115838fd8f96db4d386d42d4b.tar.xz
yuzu-5295a925d8fd5e0115838fd8f96db4d386d42d4b.tar.zst
yuzu-5295a925d8fd5e0115838fd8f96db4d386d42d4b.zip
-rw-r--r--CMakeLists.txt6
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)
# 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