mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CMake: Re-use external xbyak target if present (#62)

Browse source
This commit is contained in:
Yuri Kunde Schlesner 2016-12-12 06:23:42 -08:00 committed by Merry
parent 5bea2e1680
commit 34e19f135c
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -96,9 +96,6 @@ include_directories(${Boost_INCLUDE_DIRS})
include_directories(externals/catch) include_directories(externals/catch)
enable_testing(true) # Enables unit-testing. enable_testing(true) # Enables unit-testing.
# Include Xbyak
include_directories(externals/xbyak/xbyak)
# Include LLVM # Include LLVM
if (DYNARMIC_USE_LLVM) if (DYNARMIC_USE_LLVM)
find_package(LLVM REQUIRED CONFIG) find_package(LLVM REQUIRED CONFIG)

7
externals/CMakeLists.txt vendored
View file

@ -6,3 +6,10 @@ if (NOT DYNARMIC_NO_BUNDLED_FMT)
# fmtlib formatting library # fmtlib formatting library
add_subdirectory(fmt) add_subdirectory(fmt)
endif() 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()

1
src/CMakeLists.txt
View file

@ -107,3 +107,4 @@ target_link_libraries(dynarmic PRIVATE fmt-header-only)
if (CMAKE_SYSTEM_NAME STREQUAL "Windows") if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
target_compile_definitions(dynarmic PRIVATE FMT_USE_WINDOWS_H=0) target_compile_definitions(dynarmic PRIVATE FMT_USE_WINDOWS_H=0)
endif() endif()
target_link_libraries(dynarmic PRIVATE xbyak)