summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2021-10-20 02:30:27 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-10-20 02:30:27 +0200
commitf190547bbb930dacb3a7ee01784188f3bfe375ce (patch)
treed6056679529502f950eaf6f68a5cf2fe8f674c74 /CMakeLists.txt
parentMerge pull request #7197 from Moonlacer/tas_help_link (diff)
downloadyuzu-f190547bbb930dacb3a7ee01784188f3bfe375ce.tar
yuzu-f190547bbb930dacb3a7ee01784188f3bfe375ce.tar.gz
yuzu-f190547bbb930dacb3a7ee01784188f3bfe375ce.tar.bz2
yuzu-f190547bbb930dacb3a7ee01784188f3bfe375ce.tar.lz
yuzu-f190547bbb930dacb3a7ee01784188f3bfe375ce.tar.xz
yuzu-f190547bbb930dacb3a7ee01784188f3bfe375ce.tar.zst
yuzu-f190547bbb930dacb3a7ee01784188f3bfe375ce.zip
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt5
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)
# 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")
- file(DOWNLOAD "https://github.com/conan-io/cmake-conan/raw/v0.15/conan.cmake"
+ # 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")
endif()
include(${CMAKE_BINARY_DIR}/conan.cmake)
- conan_check(VERSION 1.24.0 REQUIRED)
+ conan_check(VERSION 1.41.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