diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2024-01-30 11:58:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 11:58:48 -0500 |
| commit | 6524f20de4c1b49ab510aa1b087f6bac27acd546 (patch) | |
| tree | d8d7d4532faba411fde01188da85664b75ca8bb1 /externals | |
| parent | 8ddfecfbaea7b08e300350fd2f14fb6b2e79634b (diff) | |
| parent | 73e7a259fde9c121adae915986c5f1f9e6fc5d54 (diff) | |
Merge pull request #12847 from abouvier/cmake-oaknut
cmake: prefer system oaknut library
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
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) |