From 73e7a259fde9c121adae915986c5f1f9e6fc5d54 Mon Sep 17 00:00:00 2001 From: Alexandre Bouvier Date: Mon, 29 Jan 2024 22:17:00 +0100 Subject: cmake: prefer system oaknut library --- externals/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'externals') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 42355716c..d49a2e43e 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -14,16 +14,17 @@ set(BUILD_SHARED_LIBS OFF) # Skip install rules for all externals set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON) -# xbyak +# Xbyak (also used by Dynarmic, so needs to be added first) if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak) add_subdirectory(xbyak) endif() -# Dynarmic +# Oaknut (also used by Dynarmic, so needs to be added first) if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut) add_subdirectory(oaknut) endif() +# Dynarmic if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic) set(DYNARMIC_IGNORE_ASSERTS ON) add_subdirectory(dynarmic) -- cgit v1.2.3