From 5dac8c789e423c6ce4792be9cc2a5144e58272cc Mon Sep 17 00:00:00 2001 From: crueter Date: Sun, 7 Sep 2025 19:57:53 -0400 Subject: [PATCH] fix non-system mcl Signed-off-by: crueter --- src/dynarmic/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txt index 11a8b620ae..0065b1cf7f 100644 --- a/src/dynarmic/CMakeLists.txt +++ b/src/dynarmic/CMakeLists.txt @@ -152,12 +152,20 @@ endif() find_package(Boost 1.57 REQUIRED) find_package(fmt 9 CONFIG) + +# Pull in externals CMakeLists for libs where available +add_subdirectory(externals) + find_package(mcl 0.1.12 REQUIRED) if ("arm64" IN_LIST ARCHITECTURE OR DYNARMIC_TESTS) find_package(oaknut 2.0.1 CONFIG) endif() +if ("riscv" IN_LIST ARCHITECTURE) + find_package(biscuit 0.9.1 REQUIRED) +endif() + if ("x86_64" IN_LIST ARCHITECTURE) find_package(xbyak 7 CONFIG) find_package(zycore REQUIRED) @@ -176,9 +184,6 @@ if (DYNARMIC_TESTS) endif() endif() -# Pull in externals CMakeLists for libs where available -add_subdirectory(externals) - # Dynarmic project files add_subdirectory(src/dynarmic) if (DYNARMIC_TESTS)