From 138aa22417944b4aed44e16a4328b348413a96c6 Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 10 Nov 2025 03:05:53 -0500 Subject: [PATCH] fix2 Signed-off-by: crueter --- src/yuzu/CMakeLists.txt | 3 ++- src/yuzu_cmd/CMakeLists.txt | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index c9abff6e26..0070e66318 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -447,7 +447,7 @@ if (YUZU_ROOM) target_link_libraries(yuzu PRIVATE Qt6::Widgets) endif() -if (YUZU_STATIC_BUILD) +if (NOT YUZU_STATIC_BUILD) # needed for vma target_compile_options(yuzu PRIVATE -Wno-conversion @@ -455,4 +455,5 @@ if (YUZU_STATIC_BUILD) -Wno-unused-parameter -Wno-missing-field-initializers) endif() + create_target_directory_groups(yuzu) diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt index c31c6df472..aed38ce41d 100644 --- a/src/yuzu_cmd/CMakeLists.txt +++ b/src/yuzu_cmd/CMakeLists.txt @@ -62,11 +62,11 @@ if (YUZU_STATIC_BUILD) # At a guess, it's probably because Qt handles the Qt executable for us, whereas this does not target_link_options(yuzu-cmd PRIVATE -static -lpthread) target_link_options(yuzu-cmd PRIVATE -static-libgcc -static-libstdc++) - - # needed for vma - target_compile_options(yuzu-cmd PRIVATE - -Wno-conversion - -Wno-unused-variable - -Wno-unused-parameter - -Wno-missing-field-initializers) endif() + +# needed for vma +target_compile_options(yuzu-cmd PRIVATE + -Wno-conversion + -Wno-unused-variable + -Wno-unused-parameter + -Wno-missing-field-initializers)