summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-04-25 06:05:28 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2022-04-25 06:05:28 +0200
commit7709374f4ff4c64e19a067d7033ed58e64da2733 (patch)
treed67791c4a64f19eac28c87d901440ce1e3b12497
parentCMakeLists: Update Conan requirement to 1.45.0 (diff)
downloadyuzu-7709374f4ff4c64e19a067d7033ed58e64da2733.tar
yuzu-7709374f4ff4c64e19a067d7033ed58e64da2733.tar.gz
yuzu-7709374f4ff4c64e19a067d7033ed58e64da2733.tar.bz2
yuzu-7709374f4ff4c64e19a067d7033ed58e64da2733.tar.lz
yuzu-7709374f4ff4c64e19a067d7033ed58e64da2733.tar.xz
yuzu-7709374f4ff4c64e19a067d7033ed58e64da2733.tar.zst
yuzu-7709374f4ff4c64e19a067d7033ed58e64da2733.zip
-rw-r--r--CMakeLists.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b1f7a6c8..dcd4011a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -405,9 +405,7 @@ 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)