From 459d1478f3fa0a9d5f6c2d0b1bf7349e26c9b794 Mon Sep 17 00:00:00 2001 From: SachinVin Date: Thu, 18 Jul 2019 16:39:14 +0100 Subject: [PATCH] CMakeLists: xbyak should only be linked on x64 --- src/CMakeLists.txt | 6 +++++- tests/CMakeLists.txt | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 30c427dc..9baa24a2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -325,6 +325,8 @@ if (ARCHITECTURE_x86_64) else() target_sources(dynarmic PRIVATE backend/x64/exception_handler_generic.cpp) endif() + + target_link_libraries(dynarmic PRIVATE xbyak) elseif(ARCHITECTURE_Aarch64) target_sources(dynarmic PRIVATE backend/A64/emitter/a64_emitter.cpp @@ -350,9 +352,11 @@ target_link_libraries(dynarmic fmt::fmt mp tsl::robin_map - xbyak $<$:${llvm_libs}> ) +if (ARCHITECTURE_x86_64) + target_link_libraries(dynarmic PRIVATE xbyak) +endif() if (DYNARMIC_ENABLE_CPU_FEATURE_DETECTION) target_compile_definitions(dynarmic PRIVATE DYNARMIC_ENABLE_CPU_FEATURE_DETECTION=1) endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index faaf90b3..f814c075 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -43,7 +43,12 @@ include(CreateDirectoryGroups) create_target_directory_groups(dynarmic_tests) create_target_directory_groups(dynarmic_print_info) -target_link_libraries(dynarmic_tests PRIVATE dynarmic boost catch fmt mp xbyak) +target_link_libraries(dynarmic_tests PRIVATE dynarmic boost catch fmt mp) + +if (ARCHITECTURE_x86_64) + target_link_libraries(dynarmic_tests PRIVATE xbyak) +endif() + target_include_directories(dynarmic_tests PRIVATE . ../src) target_compile_options(dynarmic_tests PRIVATE ${DYNARMIC_CXX_FLAGS}) target_compile_definitions(dynarmic_tests PRIVATE FMT_USE_USER_DEFINED_LITERALS=0)