From 7588de09a23a28b78a2115b01d8c6977199e3723 Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 28 Jul 2025 02:07:20 -0400 Subject: [PATCH] [cmake] fix zycore fetch Signed-off-by: crueter --- CMakeLists.txt | 2 ++ externals/dynarmic/externals/CMakeLists.txt | 19 ++++++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e11553d9e..2d9ddb57ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,6 +214,8 @@ if (YUZU_USE_BUNDLED_VCPKG) include(CPM) set(CPM_USE_LOCAL_PACKAGES OFF) + # crueter: unfortunately shallow-downloading vcpkg isn't possible + # hence why I want to remove it CPMAddPackage( NAME vcpkg DOWNLOAD_ONLY YES diff --git a/externals/dynarmic/externals/CMakeLists.txt b/externals/dynarmic/externals/CMakeLists.txt index 772f51535b..0e57588184 100644 --- a/externals/dynarmic/externals/CMakeLists.txt +++ b/externals/dynarmic/externals/CMakeLists.txt @@ -80,6 +80,12 @@ CPMAddPackage( # zydis +if ("x86_64" IN_LIST ARCHITECTURE) + CPMAddPackage( + NAME Zycore + URL "https://github.com/zyantific/zycore-c/archive/75a36c45ae.zip" + ) + CPMAddPackage( NAME Zydis VERSION 4 @@ -88,16 +94,7 @@ CPMAddPackage( "ZYDIS_BUILD_TOOLS OFF" "ZYDIS_BUILD_EXAMPLES OFF" "ZYDIS_BUILD_DOXYGEN OFF" + "ZYAN_ZYCORE_PATH ${Zycore_SOURCE_DIR}" + "CMAKE_DISABLE_FIND_PACKAGE_Doxygen ON" ) - -CPMAddPackage( - NAME Zycore - URL "https://github.com/zyantific/zycore-c/archive/75a36c45ae.zip" -) - -if (Zydis_ADDED) - if ("x86_64" IN_LIST ARCHITECTURE) - set(ZYAN_ZYCORE_PATH "${Zycore_SOURCE_DIR}" CACHE PATH "") - set(CMAKE_DISABLE_FIND_PACKAGE_Doxygen ON) - endif() endif()