Browse Source
[cmake] Move Qt externals handling to root CMakeLists.txt, and move QuaZip to upstream
QuaZip lets you disable QTextCodec now so we can use it.
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3447/head
crueter
6 days ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
5 changed files with
28 additions and
40 deletions
-
CMakeLists.txt
-
cpmfile.json
-
src/qt_common/CMakeLists.txt
-
src/qt_common/externals/CMakeLists.txt
-
src/qt_common/externals/cpmfile.json
|
|
|
@ -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)) |
|
|
|
|
|
|
|
@ -103,5 +103,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" |
|
|
|
} |
|
|
|
} |
|
|
|
@ -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) |
|
|
|
|
|
|
|
|
|
|
|
@ -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) |
|
|
|
@ -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" |
|
|
|
} |
|
|
|
} |