aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrueter <crueter@eden-emu.dev>2026-02-02 06:17:57 +0100
committercrueter <crueter@eden-emu.dev>2026-02-02 06:17:57 +0100
commit2a3507c2b92a577cf9814b5722c2adc6a0012cb0 (patch)
tree45d3dfb03da9ed67d2ff6becbaa1d4dca0ed69f5
parentf71f43561deb3450ecebd78e6c29a83c0c88ad09 (diff)
[cmake] Move Qt externals handling to root CMakeLists.txt, and move QuaZip to upstream (#3447)
QuaZip lets you disable QTextCodec now so we can use it. Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3447 Reviewed-by: DraVee <dravee@eden-emu.dev> Reviewed-by: Lizzie <lizzie@eden-emu.dev>
-rw-r--r--CMakeLists.txt8
-rw-r--r--cpmfile.json19
-rw-r--r--src/qt_common/CMakeLists.txt4
-rw-r--r--src/qt_common/externals/CMakeLists.txt19
-rw-r--r--src/qt_common/externals/cpmfile.json18
5 files changed, 28 insertions, 40 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3fe858875..86a67ce0a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -693,6 +693,14 @@ if (ENABLE_QT)
set(QT_MAJOR_VERSION 6)
# Qt6 sets cxx_std_17 and we need to undo that
set_target_properties(Qt6::Platform PROPERTIES INTERFACE_COMPILE_FEATURES "")
+
+ ## Qt Externals ##
+
+ # QuaZip
+ AddJsonPackage(quazip)
+
+ # frozen
+ AddJsonPackage(frozen)
endif()
if (NOT YUZU_STATIC_ROOM AND NOT (YUZU_USE_BUNDLED_FFMPEG OR YUZU_USE_EXTERNAL_FFMPEG))
diff --git a/cpmfile.json b/cpmfile.json
index 5a12273435..7a904c88ca 100644
--- a/cpmfile.json
+++ b/cpmfile.json
@@ -101,5 +101,24 @@
"git_version": "1.4.335.0",
"artifact": "android-binaries-%VERSION%.zip",
"hash": "48167c4a17736301bd08f9290f41830443e1f18cce8ad867fc6f289b49e18b40e93c9850b377951af82f51b5b6d7313aa6a884fc5df79f5ce3df82696c1c1244"
+ },
+ "quazip": {
+ "package": "QuaZip-Qt6",
+ "repo": "stachenov/quazip",
+ "sha": "2e95c9001b",
+ "hash": "609c240c7f029ac26a37d8fbab51bc16284e05e128b78b9b9c0e95d083538c36047a67d682759ac990e4adb0eeb90f04f1ea7fe2253bbda7e7e3bcce32e53dd8",
+ "version": "1.3",
+ "git_version": "1.5",
+ "options": [
+ "QUAZIP_QT_MAJOR_VERSION 6",
+ "QUAZIP_INSTALL OFF",
+ "QUAZIP_ENABLE_QTEXTCODEC OFF"
+ ]
+ },
+ "frozen": {
+ "package": "frozen",
+ "repo": "serge-sans-paille/frozen",
+ "sha": "61dce5ae18",
+ "hash": "b8dfe741c82bc178dfc9749d4ab5a130cee718d9ee7b71d9b547cf5f7f23027ed0152ad250012a8546399fcc1e12187efc68d89d6731256c4d2df7d04eef8d5c"
}
}
diff --git a/src/qt_common/CMakeLists.txt b/src/qt_common/CMakeLists.txt
index 5a6bbda13c..2dc342cf9d 100644
--- a/src/qt_common/CMakeLists.txt
+++ b/src/qt_common/CMakeLists.txt
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
# SPDX-License-Identifier: GPL-3.0-or-later
add_library(qt_common STATIC
@@ -78,8 +78,6 @@ target_compile_definitions(qt_common PUBLIC
QT_NO_URL_CAST_FROM_STRING
)
-add_subdirectory(externals)
-
# pass targets
find_package(frozen)
diff --git a/src/qt_common/externals/CMakeLists.txt b/src/qt_common/externals/CMakeLists.txt
deleted file mode 100644
index b998090d90..0000000000
--- a/src/qt_common/externals/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-include(CPMUtil)
-
-# Disable tests/tools in all externals supporting the standard option name
-set(BUILD_TESTING OFF)
-
-# Build only static externals
-set(BUILD_SHARED_LIBS OFF)
-
-# Skip install rules for all externals
-set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON)
-
-# QuaZip
-AddJsonPackage(quazip)
-
-# frozen
-AddJsonPackage(frozen)
diff --git a/src/qt_common/externals/cpmfile.json b/src/qt_common/externals/cpmfile.json
deleted file mode 100644
index 8d90fdc77c..0000000000
--- a/src/qt_common/externals/cpmfile.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "quazip": {
- "package": "QuaZip-Qt6",
- "repo": "crueter/quazip-qt6",
- "sha": "f838774d63",
- "hash": "e8f950f47c1f358e2666f08517a9b5b06980677540d3836384e2c27ff5bb129b218f1502b03fdb207d7fd4cd56893f0a0d9094ba8309f19a49cb11e3bb911594",
- "version": "1.3",
- "options": [
- "QUAZIP_INSTALL OFF"
- ]
- },
- "frozen": {
- "package": "frozen",
- "repo": "serge-sans-paille/frozen",
- "sha": "61dce5ae18",
- "hash": "b8dfe741c82bc178dfc9749d4ab5a130cee718d9ee7b71d9b547cf5f7f23027ed0152ad250012a8546399fcc1e12187efc68d89d6731256c4d2df7d04eef8d5c"
- }
-}