From 45c07f4bad351d9c0f96f7fc59b2bafc8c27caad Mon Sep 17 00:00:00 2001 From: crueter Date: Wed, 3 Dec 2025 15:14:13 -0500 Subject: [PATCH] fix moltenvk system find Signed-off-by: crueter --- externals/CMakeLists.txt | 12 +++++++++--- externals/cpmfile.json | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index e4f9e114f2..28b34d56ac 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -394,9 +394,15 @@ if (ANDROID) endif() # moltenvk -if (YUZU_USE_BUNDLED_MOLTENVK) +if (NOT YUZU_USE_BUNDLED_MOLTENVK) + find_library(MOLTENVK_LIBRARY MoltenVK) +else() + unset(MOLTENVK_LIBRARY) +endif() + +# TODO: kosmickrisp? +if (NOT MOLTENVK_LIBRARY) AddJsonPackage(moltenvk) - list(APPEND CMAKE_PREFIX_PATH "${moltenvk_SOURCE_DIR}/MoltenVK/dylib/macOS") - set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) + set(MOLTENVK_LIBRARY "${moltenvk_SOURCE_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" CACHE STRING "" FORCE) endif() diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 62ac4a5550..067a824b64 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -216,6 +216,7 @@ "tag": "v%VERSION%", "git_version": "1.4.1", "artifact": "MoltenVK-macOS.tar", - "hash": "a394329f390a11d1052d2efeef5f7f33860465eea4d7e9e1faf808e616d533a283b9c55074fb833ef95ef40067fc319470eab07dc72ac63e6464dc26cbe34905" + "hash": "a394329f390a11d1052d2efeef5f7f33860465eea4d7e9e1faf808e616d533a283b9c55074fb833ef95ef40067fc319470eab07dc72ac63e6464dc26cbe34905", + "bundled": true } }