diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 1421544464..bf52f451b4 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -416,25 +416,26 @@ if (APPLE) find_library(IOSURFACE_LIBRARY IOSurface REQUIRED) find_library(QUARTZCORE_LIBRARY QuartzCore REQUIRED) - add_library(MoltenVK::MoltenVK STATIC IMPORTED) + add_library(MoltenVK::MoltenVK STATIC IMPORTED GLOBAL) set_target_properties(MoltenVK::MoltenVK PROPERTIES IMPORTED_LOCATION "${MVK_STATIC}" ) target_link_libraries(MoltenVK::MoltenVK INTERFACE ${IOSURFACE_LIBRARY} ${QUARTZCORE_LIBRARY}) else() - add_library(MoltenVK::MoltenVK SHARED IMPORTED) + add_library(MoltenVK::MoltenVK SHARED IMPORTED GLOBAL) set_target_properties(MoltenVK::MoltenVK PROPERTIES IMPORTED_LOCATION "${MVK_DYLIB}" ) endif() - - target_link_libraries(yuzu PRIVATE MoltenVK::MoltenVK) else() message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.") set_source_files_properties(${MOLTENVK_LIBRARY} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks XCODE_FILE_ATTRIBUTES "CodeSignOnCopy") - target_sources(yuzu ${MOLTENVK_LIBRARY}) + add_library(MoltenVK::MoltenVK SHARED IMPORTED GLOBAL) + set_target_properties(MoltenVK::MoltenVK PROPERTIES + IMPORTED_LOCATION "${MOLTENVK_LIBRARY}" + ) endif() endif() diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 71b463b495..e83b5f32eb 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -366,19 +366,7 @@ if (APPLE) set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE) set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) - find_library(MOLTENVK_LIBRARY MoltenVK) - - if (NOT MOLTENVK_LIBRARY OR YUZU_USE_BUNDLED_MOLTENVK) - set(MOLTENVK_PLATFORM "macos") - set(MOLTENVK_VERSION "v1.4.0") - download_moltenvk(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION}) - target_link_libraries(yuzu PRIVATE MoltenVK::MoltenVK) - else() - message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.") - set_source_files_properties(${MOLTENVK_LIBRARY} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks - XCODE_FILE_ATTRIBUTES "CodeSignOnCopy") - target_link_libraries(yuzu PRIVATE ${MOLTENVK_LIBRARY}) - endif() + target_link_libraries(yuzu PRIVATE MoltenVK::MoltenVK) endif() if(WIN32)