Browse Source
[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>
pull/3455/head
crueter
3 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 )
# Q t 6 s e t s c x x _ s t d _ 1 7 a n d w e n e e d t o u n d o t h a t
set_target_properties ( Qt6::Platform PROPERTIES INTERFACE_COMPILE_FEATURES "" )
# # Q t E x t e r n a l s # #
# Q u a Z i p
AddJsonPackage ( quazip )
# f r o z e n
AddJsonPackage ( frozen )
endif ( )
if ( NOT YUZU_STATIC_ROOM AND NOT ( YUZU_USE_BUNDLED_FFMPEG OR YUZU_USE_EXTERNAL_FFMPEG ) )
@ -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"
}
}
@ -1,4 +1,4 @@
# S P D X - F i l e C o p y r i g h t T e x t : C o p y r i g h t 2 0 2 5 E d e n E m u l a t o r P r o j e c t
# S P D X - F i l e C o p y r i g h t T e x t : C o p y r i g h t 2 0 2 6 E d e n E m u l a t o r P r o j e c t
# S P D X - L i c e n s e - I d e n t i f i e r : G P L - 3 . 0 - o r - l a t e r
add_library ( qt_common STATIC
@ -78,8 +78,6 @@ target_compile_definitions(qt_common PUBLIC
Q T _ N O _ U R L _ C A S T _ F R O M _ S T R I N G
)
add_subdirectory ( externals )
# p a s s t a r g e t s
find_package ( frozen )
@ -1,19 +0,0 @@
# S P D X - F i l e C o p y r i g h t T e x t : C o p y r i g h t 2 0 2 5 E d e n E m u l a t o r P r o j e c t
# S P D X - L i c e n s e - I d e n t i f i e r : G P L - 3 . 0 - o r - l a t e r
include ( CPMUtil )
# D i s a b l e t e s t s / t o o l s i n a l l e x t e r n a l s s u p p o r t i n g t h e s t a n d a r d o p t i o n n a m e
set ( BUILD_TESTING OFF )
# B u i l d o n l y s t a t i c e x t e r n a l s
set ( BUILD_SHARED_LIBS OFF )
# S k i p i n s t a l l r u l e s f o r a l l e x t e r n a l s
set_directory_properties ( PROPERTIES EXCLUDE_FROM_ALL ON )
# Q u a Z i p
AddJsonPackage ( quazip )
# f r o z e n
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"
}
}