early-access version 2704
This commit is contained in:
parent
2a6fdfa689
commit
59fa0d5919
2 changed files with 3 additions and 5 deletions
|
@ -405,13 +405,11 @@ if (CONAN_REQUIRED_LIBS)
|
||||||
# Download conan.cmake automatically, you can also just copy the conan.cmake file
|
# Download conan.cmake automatically, you can also just copy the conan.cmake file
|
||||||
if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
|
if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
|
||||||
message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
|
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/release/0.18/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake")
|
||||||
file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/43e385830ee35377dbd2dcbe8d5a9e750301ea00/conan.cmake"
|
|
||||||
"${CMAKE_BINARY_DIR}/conan.cmake")
|
|
||||||
endif()
|
endif()
|
||||||
include(${CMAKE_BINARY_DIR}/conan.cmake)
|
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
|
# 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
|
# We don't need to add it through find_package or anything since the other two can find it just fine
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 2701.
|
This is the source code for early-access 2704.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue