Browse Source
Merge pull request #12847 from abouvier/cmake-oaknut
cmake: prefer system oaknut library
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
7 additions and
2 deletions
-
CMakeLists.txt
-
externals/CMakeLists.txt
|
|
|
@ -322,6 +322,10 @@ if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) |
|
|
|
find_package(xbyak 6 CONFIG) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (ARCHITECTURE_arm64) |
|
|
|
find_package(oaknut 2.0.1 CONFIG) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) |
|
|
|
find_package(dynarmic 6.4.0 CONFIG) |
|
|
|
endif() |
|
|
|
|
|
|
|
@ -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) |
|
|
|
|
