From 34e19f135c0dd2feac4f77660f51aa4ea28a7386 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 12 Dec 2016 06:23:42 -0800 Subject: [PATCH] CMake: Re-use external xbyak target if present (#62) --- CMakeLists.txt | 3 --- externals/CMakeLists.txt | 7 +++++++ src/CMakeLists.txt | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d72c569e..42067c1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,9 +96,6 @@ include_directories(${Boost_INCLUDE_DIRS}) include_directories(externals/catch) enable_testing(true) # Enables unit-testing. -# Include Xbyak -include_directories(externals/xbyak/xbyak) - # Include LLVM if (DYNARMIC_USE_LLVM) find_package(LLVM REQUIRED CONFIG) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index e9fa0d6d..a8333a4c 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -6,3 +6,10 @@ if (NOT DYNARMIC_NO_BUNDLED_FMT) # fmtlib formatting library add_subdirectory(fmt) endif() + +if (NOT TARGET xbyak) + if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) + add_library(xbyak INTERFACE) + target_include_directories(xbyak INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/xbyak/xbyak) + endif() +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1b662919..d78c8d4e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -107,3 +107,4 @@ target_link_libraries(dynarmic PRIVATE fmt-header-only) if (CMAKE_SYSTEM_NAME STREQUAL "Windows") target_compile_definitions(dynarmic PRIVATE FMT_USE_WINDOWS_H=0) endif() +target_link_libraries(dynarmic PRIVATE xbyak)