From c1267bec3d927bb4c5a1bf6de9c270132c52900f Mon Sep 17 00:00:00 2001 From: Guo Yunhe Date: Sat, 9 Aug 2025 22:05:31 +0800 Subject: [PATCH 1/2] allow packaging use system quazip-qt6 --- CMakeLists.txt | 3 +++ src/yuzu/CMakeLists.txt | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a364821734..558f117b3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,10 +78,13 @@ else() option(YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS "Use SPIRV-Tools from externals" ON) endif() +option(YUZU_USE_EXTERNAL_QUAZIP_QT6 "Use quazip-qt6 from externals" ON) + option(YUZU_USE_SYSTEM_OPUS "Use the system Opus library if available" ON) option(YUZU_USE_SYSTEM_HTTPLIB "Use the system cpp-httplib if available" ON) + option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF) option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 2902b695ad..6f3a5f1104 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -493,7 +493,12 @@ if (YUZU_ROOM) endif() # Extra deps -add_subdirectory(externals) +if (YUZU_USE_EXTERNAL_QUAZIP_QT6) + add_subdirectory(externals) +else() + find_package(QuaZip) +endif() + target_link_libraries(yuzu PRIVATE QuaZip::QuaZip) create_target_directory_groups(yuzu) -- 2.39.5 From 6ec5cd69f8038043136f0c0cfe01592271ac1ab1 Mon Sep 17 00:00:00 2001 From: Guo Yunhe Date: Sat, 9 Aug 2025 23:05:15 +0800 Subject: [PATCH 2/2] fix line --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 558f117b3e..47a7e736db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,6 @@ option(YUZU_USE_SYSTEM_OPUS "Use the system Opus library if available" ON) option(YUZU_USE_SYSTEM_HTTPLIB "Use the system cpp-httplib if available" ON) - option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF) option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) -- 2.39.5