diff options
| author | crueter <crueter@eden-emu.dev> | 2025-08-14 00:00:35 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-08-14 00:00:35 +0200 |
| commit | bd944b71d5f2e36106da7acb4ea4fbe07e5df506 (patch) | |
| tree | 6726ee9e5953b6f4e4dcb7d41fe640b4f9b165dc /src | |
| parent | 1465757ded615eb7c8fe8fa724ca353264b774c8 (diff) | |
[cmake] fix vcpkg and zy* install (#247)
vcpkg wouldn't clone before, but now it actually does and seems to work in my testing
also doesn't install zycore and zydis (thanks aur testers)
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/247
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src')
| -rw-r--r-- | src/dynarmic/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/dynarmic/externals/CMakeLists.txt | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txt index 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.txt index 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 76b0be8dae HASH 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 sucks if ("x86_64" IN_LIST ARCHITECTURE) AddPackage( NAME Zycore REPO "zyantific/zycore-c" SHA 75a36c45ae HASH 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() |