VERY experimental Nintendo Switch 2 emulator
C++
[cmake] Fix MoltenVK Fetch and Dynarmic tests build (#3559)
crueterf8145152c7b3
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex 6c3e5cbde3..3b4627d48b 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -407,12 +407,10 @@ if (APPLE)# moltenvkif (NOT YUZU_USE_BUNDLED_MOLTENVK)find_library(MOLTENVK_LIBRARY MoltenVK)- else()- unset(MOLTENVK_LIBRARY)endif()# TODO: kosmickrisp?- if (NOT MOLTENVK_LIBRARY)+ if (NOT MOLTENVK_LIBRARY OR YUZU_USE_BUNDLED_MOLTENVK)AddJsonPackage(moltenvk)set(MOLTENVK_LIBRARY "${moltenvk_SOURCE_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" CACHE STRING "" FORCE)diff --git a/src/dynarmic/tests/CMakeLists.txt b/src/dynarmic/tests/CMakeLists.txtindex 363f8579db..395181efe3 100644--- a/src/dynarmic/tests/CMakeLists.txt+++ b/src/dynarmic/tests/CMakeLists.txt@@ -24,7 +24,7 @@ add_executable(dynarmic_testsA64/real_world.cppA64/testenv.h)-target_link_libraries(dynarmic_tests PRIVATE merry::oaknut)+target_link_libraries(dynarmic_tests PRIVATE merry::oaknut unordered_dense::unordered_dense)if (DYNARMIC_TESTS_USE_UNICORN)target_link_libraries(dynarmic_tests PRIVATE Unicorn::Unicorn)@@ -72,7 +72,7 @@ add_executable(dynarmic_print_infoprint_info.cpp)create_target_directory_groups(dynarmic_print_info)-target_link_libraries(dynarmic_print_info PRIVATE dynarmic fmt::fmt merry::mcl)+target_link_libraries(dynarmic_print_info PRIVATE dynarmic fmt::fmt merry::mcl unordered_dense::unordered_dense)if (BOOST_NO_HEADERS)target_link_libraries(dynarmic_print_info PRIVATE Boost::variant Boost::icl Boost::pool)else()@@ -93,7 +93,7 @@ add_executable(dynarmic_test_generatorcreate_target_directory_groups(dynarmic_test_generator)-target_link_libraries(dynarmic_test_generator PRIVATE dynarmic fmt::fmt merry::mcl)+target_link_libraries(dynarmic_test_generator PRIVATE dynarmic fmt::fmt merry::mcl unordered_dense::unordered_dense)if (BOOST_NO_HEADERS)target_link_libraries(dynarmic_test_generator PRIVATE Boost::variant Boost::icl Boost::pool)else()@@ -110,7 +110,7 @@ add_executable(dynarmic_test_readertest_reader.cpp)create_target_directory_groups(dynarmic_test_reader)-target_link_libraries(dynarmic_test_reader PRIVATE dynarmic fmt::fmt merry::mcl)+target_link_libraries(dynarmic_test_reader PRIVATE dynarmic fmt::fmt merry::mcl unordered_dense::unordered_dense)if (BOOST_NO_HEADERS)target_link_libraries(dynarmic_test_reader PRIVATE Boost::variant Boost::icl Boost::pool)else()@@ -123,7 +123,7 @@ target_compile_definitions(dynarmic_test_reader PRIVATE FMT_USE_USER_DEFINED_LIT#create_target_directory_groups(dynarmic_tests)-target_link_libraries(dynarmic_tests PRIVATE dynarmic Catch2::Catch2WithMain fmt::fmt merry::mcl)+target_link_libraries(dynarmic_tests PRIVATE dynarmic Catch2::Catch2WithMain fmt::fmt merry::mcl unordered_dense::unordered_dense)if (BOOST_NO_HEADERS)target_link_libraries(dynarmic_tests PRIVATE Boost::variant Boost::icl Boost::pool)else()