eden-emu/eden
24
4
Fork 15
Code Issues 139 Pull requests 53 Projects 1 Releases Packages Wiki Activity Actions

[cmake] fix yuzu_cmd, bundled overrides
All checks were successful
eden-license / license-header (pull_request) Successful in 27s
Details

Browse source 
Fixes yuzu_cmd not linking to vma (just link to vma for now, but should
be linked to video_core maybe?)

also fixes the weird precedence of bundled packages esp w.r.t json where
an effectively garbage value was passed into the BUNDLED_PACKAGE
argument (was forced to on)

Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-09-02 15:47:50 -04:00
parent 84fadd1506
commit 6db8c1956a
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CMakeModules/CPMUtil.cmake
View file

@ -184,8 +184,6 @@ function(AddJsonPackage)
# system/bundled # system/bundled
if (bundled STREQUAL "unset" AND DEFINED JSON_BUNDLED_PACKAGE) if (bundled STREQUAL "unset" AND DEFINED JSON_BUNDLED_PACKAGE)
set(bundled ${JSON_BUNDLED_PACKAGE}) set(bundled ${JSON_BUNDLED_PACKAGE})
else()
set(bundled ON)
endif() endif()
AddPackage( AddPackage(
@ -259,6 +257,7 @@ function(AddPackage)
KEY KEY
BUNDLED_PACKAGE BUNDLED_PACKAGE
FIND_PACKAGE_ARGUMENTS
) )
set(multiValueArgs OPTIONS PATCHES) set(multiValueArgs OPTIONS PATCHES)
@ -409,9 +408,9 @@ function(AddPackage)
set_precedence(OFF OFF) set_precedence(OFF OFF)
elseif (CPMUTIL_FORCE_SYSTEM) elseif (CPMUTIL_FORCE_SYSTEM)
set_precedence(ON ON) set_precedence(ON ON)
elseif(NOT CPMUTIL_FORCE_BUNDLED) elseif(CPMUTIL_FORCE_BUNDLED)
set_precedence(OFF OFF) set_precedence(OFF OFF)
elseif (DEFINED PKG_ARGS_BUNDLED_PACKAGE) elseif (DEFINED PKG_ARGS_BUNDLED_PACKAGE AND NOT PKG_ARGS_BUNDLED_PACKAGE STREQUAL "unset")
if (PKG_ARGS_BUNDLED_PACKAGE) if (PKG_ARGS_BUNDLED_PACKAGE)
set(local OFF) set(local OFF)
else() else()

1
src/yuzu_cmd/CMakeLists.txt
View file

@ -39,6 +39,7 @@ create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")
target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR}) target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})
target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers) target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers)
target_link_libraries(yuzu-cmd PRIVATE GPUOpen::VulkanMemoryAllocator)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
install(TARGETS yuzu-cmd) install(TARGETS yuzu-cmd)