VERY experimental Nintendo Switch 2 emulator
C++
[cmake] fix vcpkg and zy* install (#247)
crueterbd944b71d5f2
diff --git a/CMakeLists.txt b/CMakeLists.txtindex f654ac7d46..98d90bcc2c 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -218,13 +218,7 @@ if (YUZU_USE_BUNDLED_VCPKG)include(CPMUtil)- AddPackage(- NAME vcpkg- DOWNLOAD_ONLY YES- URL "https://github.com/microsoft/vcpkg.git"- GIT_TAG "ea2a964f93"- SHA "ea2a964f93"- )+ CPMAddPackage("gh:microsoft/vcpkg#10d3b37514")include(${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake)elseif(NOT "$ENV{VCPKG_TOOLCHAIN_FILE}" STREQUAL "")diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmakeindex bd1a15b0cc..bd6ca77eaf 100644--- a/CMakeModules/CPMUtil.cmake+++ b/CMakeModules/CPMUtil.cmake@@ -30,7 +30,7 @@ function(AddPackage)cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")if (NOT DEFINED PKG_ARGS_NAME)- message(FATAL_ERROR "CPMUtil: No package name defined")+ message(FATAL_ERROR "[CPMUtil] ${PKG_ARGS_NAME}: No package name defined")endif()if (NOT DEFINED PKG_ARGS_URL)@@ -38,21 +38,21 @@ function(AddPackage)set(PKG_GIT_URL https://github.com/${PKG_ARGS_REPO})set(PKG_URL "${PKG_GIT_URL}/archive/${PKG_ARGS_SHA}.zip")else()- message(FATAL_ERROR "CPMUtil: No custom URL and no repository + sha defined")+ message(FATAL_ERROR "[CPMUtil] ${PKG_ARGS_NAME}: No custom URL and no repository + sha defined")endif()else()set(PKG_URL ${PKG_ARGS_URL})set(PKG_GIT_URL ${PKG_URL})endif()- message(STATUS "CPMUtil: Downloading package ${PKG_ARGS_NAME} from ${PKG_URL}")+ message(STATUS "[CPMUtil] ${PKG_ARGS_NAME}: Downloading package from ${PKG_URL}")if (NOT DEFINED PKG_ARGS_KEY)if (DEFINED PKG_ARGS_SHA)string(SUBSTRING ${PKG_ARGS_SHA} 0 4 PKG_KEY)- message(STATUS "CPMUtil: No custom key defined, using ${PKG_KEY} from sha")+ message(STATUS "[CPMUtil] ${PKG_ARGS_NAME}: No custom key defined, using ${PKG_KEY} from sha")else()- message(FATAL_ERROR "CPMUtil: No custom key and no commit sha defined")+ message(FATAL_ERROR "[CPMUtil] ${PKG_ARGS_NAME}: No custom key and no commit sha defined")endif()else()set(PKG_KEY ${PKG_ARGS_KEY})@@ -99,7 +99,7 @@ function(AddPackage)elseif(DEFINED PKG_ARGS_VERSION)set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS ${PKG_ARGS_VERSION})else()- message(WARNING "CPMUtil: Package ${PKG_ARGS_NAME} has no specified sha or version")+ message(WARNING "[CPMUtil] Package ${PKG_ARGS_NAME} has no specified sha or version")set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS "unknown")endif()else()diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txtindex 77ae7849f4..3d73951065 100644--- a/src/dynarmic/CMakeLists.txt+++ b/src/dynarmic/CMakeLists.txt@@ -138,7 +138,6 @@ endif()if (DYNARMIC_USE_BUNDLED_EXTERNALS)set(CMAKE_DISABLE_FIND_PACKAGE_biscuit ON)- set(CMAKE_DISABLE_FIND_PACKAGE_Catch2 ON)set(CMAKE_DISABLE_FIND_PACKAGE_fmt ON)set(CMAKE_DISABLE_FIND_PACKAGE_mcl ON)set(CMAKE_DISABLE_FIND_PACKAGE_oaknut ON)diff --git a/src/dynarmic/externals/CMakeLists.txt b/src/dynarmic/externals/CMakeLists.txtindex ce262d04d2..ec25e415e1 100644--- a/src/dynarmic/externals/CMakeLists.txt+++ b/src/dynarmic/externals/CMakeLists.txt@@ -28,6 +28,7 @@ if ("riscv" IN_LIST ARCHITECTURE)REPO "lioncash/biscuit"SHA 76b0be8daeHASH 47d55ed02d032d6cf3dc107c6c0a9aea686d5f25aefb81d1af91db027b6815bd5add1755505e19d76625feeb17aa2db6cd1668fe0dad2e6a411519bde6ca4489+ BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS})endif()@@ -92,12 +93,17 @@ AddPackage(# zydis+# TODO(crueter): maybe it's just Gentoo but zydis system package really sucksif ("x86_64" IN_LIST ARCHITECTURE)AddPackage(NAME ZycoreREPO "zyantific/zycore-c"SHA 75a36c45aeHASH 15aa399f39713e042c4345bc3175c82f14dca849fde2a21d4f591f62c43e227b70d868d8bb86beb5f4eb68b1d6bd3792cdd638acf89009e787e3d10ee7401924+ OPTIONS+ "CMAKE_DISABLE_FIND_PACKAGE_Doxygen ON"+ # BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS}+ EXCLUDE_FROM_ALL ON)AddPackage(@@ -112,5 +118,7 @@ if ("x86_64" IN_LIST ARCHITECTURE)"ZYDIS_BUILD_DOXYGEN OFF""ZYAN_ZYCORE_PATH ${Zycore_SOURCE_DIR}""CMAKE_DISABLE_FIND_PACKAGE_Doxygen ON"+ # BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS}+ EXCLUDE_FROM_ALL ON)endif()