Browse Source
[dynarmic] fix unordered_dense sys installs
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/143/head
crueter
8 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
27 additions and
17 deletions
-
externals/dynarmic/CMakeLists.txt
-
externals/dynarmic/externals/CMakeLists.txt
-
externals/dynarmic/src/dynarmic/CMakeLists.txt
|
|
@ -144,11 +144,11 @@ if (DYNARMIC_USE_BUNDLED_EXTERNALS) |
|
|
set(CMAKE_DISABLE_FIND_PACKAGE_oaknut ON) |
|
|
set(CMAKE_DISABLE_FIND_PACKAGE_oaknut ON) |
|
|
set(CMAKE_DISABLE_FIND_PACKAGE_unordered_dense ON) |
|
|
set(CMAKE_DISABLE_FIND_PACKAGE_unordered_dense ON) |
|
|
set(CMAKE_DISABLE_FIND_PACKAGE_xbyak 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) |
|
|
set(CPM_USE_LOCAL_PACKAGES ON) |
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
find_package(Boost 1.57 REQUIRED) |
|
|
find_package(Boost 1.57 REQUIRED) |
|
|
find_package(fmt 9 CONFIG) |
|
|
find_package(fmt 9 CONFIG) |
|
|
|
|
|
@ -1,5 +1,4 @@ |
|
|
include(CPM) |
|
|
include(CPM) |
|
|
set(CPM_USE_LOCAL_PACKAGES ON) |
|
|
|
|
|
|
|
|
|
|
|
# Always build externals as static libraries, even when dynarmic is built as shared |
|
|
# Always build externals as static libraries, even when dynarmic is built as shared |
|
|
if (BUILD_SHARED_LIBS) |
|
|
if (BUILD_SHARED_LIBS) |
|
|
@ -67,6 +66,7 @@ CPMAddPackage( |
|
|
URL "https://github.com/Lizzie841/unordered_dense/archive/e59d30b7b1.zip" |
|
|
URL "https://github.com/Lizzie841/unordered_dense/archive/e59d30b7b1.zip" |
|
|
OPTIONS |
|
|
OPTIONS |
|
|
"UNORDERED_DENSE_INSTALL ON" |
|
|
"UNORDERED_DENSE_INSTALL ON" |
|
|
|
|
|
FIND_PACKAGE_ARGUMENTS "CONFIG" |
|
|
) |
|
|
) |
|
|
|
|
|
|
|
|
# xbyak |
|
|
# xbyak |
|
|
|
|
|
@ -399,13 +399,23 @@ set_target_properties(dynarmic PROPERTIES |
|
|
VERSION ${dynarmic_VERSION} |
|
|
VERSION ${dynarmic_VERSION} |
|
|
SOVERSION ${dynarmic_VERSION_MAJOR}.${dynarmic_VERSION_MINOR} |
|
|
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_compile_options(dynarmic PRIVATE ${DYNARMIC_CXX_FLAGS}) |
|
|
target_link_libraries(dynarmic |
|
|
target_link_libraries(dynarmic |
|
|
PRIVATE |
|
|
PRIVATE |
|
|
Boost::boost |
|
|
Boost::boost |
|
|
fmt::fmt |
|
|
fmt::fmt |
|
|
merry::mcl |
|
|
merry::mcl |
|
|
unordered_dense |
|
|
|
|
|
) |
|
|
) |
|
|
if (DYNARMIC_USE_LLVM) |
|
|
if (DYNARMIC_USE_LLVM) |
|
|
target_include_directories(dynarmic PRIVATE ${LLVM_INCLUDE_DIRS}) |
|
|
target_include_directories(dynarmic PRIVATE ${LLVM_INCLUDE_DIRS}) |
|
|
|