Browse Source

[dynarmic] fix unordered_dense sys installs

Signed-off-by: crueter <crueter@eden-emu.dev>
pull/181/head
crueter 8 months ago
parent
commit
b2a9957630
  1. 6
      externals/dynarmic/CMakeLists.txt
  2. 2
      externals/dynarmic/externals/CMakeLists.txt
  3. 12
      externals/dynarmic/src/dynarmic/CMakeLists.txt

6
externals/dynarmic/CMakeLists.txt

@ -144,11 +144,11 @@ if (DYNARMIC_USE_BUNDLED_EXTERNALS)
set(CMAKE_DISABLE_FIND_PACKAGE_oaknut ON)
set(CMAKE_DISABLE_FIND_PACKAGE_unordered_dense ON)
set(CMAKE_DISABLE_FIND_PACKAGE_xbyak ON)
set(CMAKE_DISABLE_FIND_PACKAGE_Zydis ON)
set(CMAKE_DISABLE_FIND_PACKAGE_Zycore ON)
endif()
set(CPM_USE_LOCAL_PACKAGES OFF)
else()
set(CPM_USE_LOCAL_PACKAGES ON)
endif()
find_package(Boost 1.57 REQUIRED)
find_package(fmt 9 CONFIG)

2
externals/dynarmic/externals/CMakeLists.txt

@ -1,5 +1,4 @@
include(CPM)
set(CPM_USE_LOCAL_PACKAGES ON)
# Always build externals as static libraries, even when dynarmic is built as shared
if (BUILD_SHARED_LIBS)
@ -67,6 +66,7 @@ CPMAddPackage(
URL "https://github.com/Lizzie841/unordered_dense/archive/e59d30b7b1.zip"
OPTIONS
"UNORDERED_DENSE_INSTALL ON"
FIND_PACKAGE_ARGUMENTS "CONFIG"
)
# xbyak

12
externals/dynarmic/src/dynarmic/CMakeLists.txt

@ -399,13 +399,23 @@ set_target_properties(dynarmic PROPERTIES
VERSION ${dynarmic_VERSION}
SOVERSION ${dynarmic_VERSION_MAJOR}.${dynarmic_VERSION_MINOR}
)
if (TARGET unordered_dense::unordered_dense)
message(STATUS "Found system unordered_dense kjbgjdskfsdfb")
# weird quirk of system installs
target_link_libraries(dynarmic
PRIVATE
unordered_dense::unordered_dense
)
endif()
target_compile_options(dynarmic PRIVATE ${DYNARMIC_CXX_FLAGS})
target_link_libraries(dynarmic
PRIVATE
Boost::boost
fmt::fmt
merry::mcl
unordered_dense
)
if (DYNARMIC_USE_LLVM)
target_include_directories(dynarmic PRIVATE ${LLVM_INCLUDE_DIRS})

Loading…
Cancel
Save