From 6f88c3a363a86ce78f97bf5870595eb45be8fc05 Mon Sep 17 00:00:00 2001 From: crueter Date: Tue, 7 Oct 2025 21:05:28 -0400 Subject: [PATCH] fix src file propagation Signed-off-by: crueter --- externals/CMakeLists.txt | 9 --------- src/yuzu/CMakeLists.txt | 11 ++++++++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index bf52f451b4..391c14398d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -428,14 +428,5 @@ if (APPLE) IMPORTED_LOCATION "${MVK_DYLIB}" ) endif() - else() - message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.") - set_source_files_properties(${MOLTENVK_LIBRARY} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks - XCODE_FILE_ATTRIBUTES "CodeSignOnCopy") - - 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 e83b5f32eb..31f73928fd 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -366,7 +366,16 @@ 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) - target_link_libraries(yuzu PRIVATE MoltenVK::MoltenVK) + if (TARGET MoltenVK::MoltenVK) + target_link_libraries(yuzu PRIVATE MoltenVK::MoltenVK) + else() + find_library(MOLTENVK_LIBRARY MoltenVK) + 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 PRIVATE "${MOLTENVK_LIBRARY}") + endif() endif() if(WIN32)