[cmake] fix yuzu_cmd, bundled overrides (#381)

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>

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/381

CMakeModules/CPMUtil.cmake

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

src/android/app/build.gradle.kts

@@ -173,6 +173,7 @@ android {
                     "-DENABLE_OPENSSL=ON",
                     "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work
                     "-DYUZU_USE_CPM=ON",
+                    "-DCPMUTIL_FORCE_BUNDLED=ON",
                     "-DYUZU_USE_BUNDLED_FFMPEG=ON",
                     "-DYUZU_ENABLE_LTO=ON",
                     "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",

src/yuzu_cmd/CMakeLists.txt

@@ -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_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers)
+target_link_libraries(yuzu-cmd PRIVATE GPUOpen::VulkanMemoryAllocator)
 
 if(UNIX AND NOT APPLE)
     install(TARGETS yuzu-cmd)