diff options
| author | bunnei <bunneidev@gmail.com> | 2020-06-15 22:39:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 22:39:48 -0400 |
| commit | ed2cd9d8f3b9c82eb6013cf389c06ab783499d83 (patch) | |
| tree | a91cb4b4bd938dae7fa304fd1e2770826a87f5a2 | |
| parent | 0bd9bc7201568f1c1f6f0a0c425cff6229ffc597 (diff) | |
| parent | 256cb2979b2976017c94a4c2a42cae155bf604cd (diff) | |
Merge pull request #4091 from MerryMage/cmakelists-xbyak-order
CMakeLists: xbyak comes before dynarmic
| -rw-r--r-- | externals/CMakeLists.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index df7a5e0a9..9be5b2780 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -4,6 +4,13 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules") list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/externals/find-modules") include(DownloadExternals) +# xbyak +if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) + add_library(xbyak INTERFACE) + target_include_directories(xbyak SYSTEM INTERFACE ./xbyak/xbyak) + target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) +endif() + # Catch add_library(catch-single-include INTERFACE) target_include_directories(catch-single-include INTERFACE catch/single_include) @@ -75,11 +82,3 @@ if (ENABLE_WEB_SERVICE) target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT) target_link_libraries(httplib INTERFACE OpenSSL::SSL OpenSSL::Crypto) endif() - -if (NOT TARGET xbyak) - if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) - add_library(xbyak INTERFACE) - target_include_directories(xbyak SYSTEM INTERFACE ./xbyak/xbyak) - target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) - endif() -endif() |