Browse Source
[cmake] QuaZip: The Finale
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/74/head
crueter
8 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
4 additions and
15 deletions
-
CMakeLists.txt
-
src/yuzu/CMakeLists.txt
-
src/yuzu/externals/CMakeLists.txt
|
|
@ -467,7 +467,7 @@ if (ENABLE_QT) |
|
|
list(APPEND CMAKE_PREFIX_PATH "${Qt6_DIR}") |
|
|
list(APPEND CMAKE_PREFIX_PATH "${Qt6_DIR}") |
|
|
endif() |
|
|
endif() |
|
|
|
|
|
|
|
|
find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent Core5Compat) |
|
|
|
|
|
|
|
|
find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent) |
|
|
|
|
|
|
|
|
if (YUZU_USE_QT_MULTIMEDIA) |
|
|
if (YUZU_USE_QT_MULTIMEDIA) |
|
|
find_package(Qt6 REQUIRED COMPONENTS Multimedia) |
|
|
find_package(Qt6 REQUIRED COMPONENTS Multimedia) |
|
|
|
|
|
@ -496,6 +496,6 @@ endif() |
|
|
|
|
|
|
|
|
# Extra deps |
|
|
# Extra deps |
|
|
add_subdirectory(externals) |
|
|
add_subdirectory(externals) |
|
|
target_link_libraries(yuzu PRIVATE QuaZip::QuaZip Qt6::Core5Compat) |
|
|
|
|
|
|
|
|
target_link_libraries(yuzu PRIVATE QuaZip::QuaZip) |
|
|
|
|
|
|
|
|
create_target_directory_groups(yuzu) |
|
|
create_target_directory_groups(yuzu) |
|
|
@ -12,17 +12,6 @@ set(CPM_USE_LOCAL_PACKAGES ON) |
|
|
CPMAddPackage( |
|
|
CPMAddPackage( |
|
|
NAME QuaZip-Qt6 |
|
|
NAME QuaZip-Qt6 |
|
|
VERSION 1.3 |
|
|
VERSION 1.3 |
|
|
GIT_REPOSITORY "https://github.com/stachenov/quazip.git" |
|
|
|
|
|
GIT_TAG v1.5 |
|
|
|
|
|
PATCHES |
|
|
|
|
|
${CMAKE_SOURCE_DIR}/.patch/quazip/0001-strict.patch |
|
|
|
|
|
${CMAKE_SOURCE_DIR}/.patch/quazip/0002-oldstyle.patch |
|
|
|
|
|
${CMAKE_SOURCE_DIR}/.patch/quazip/0003-predecls.patch |
|
|
|
|
|
${CMAKE_SOURCE_DIR}/.patch/quazip/0004-qt6-only.patch |
|
|
|
|
|
|
|
|
|
|
|
# thanks to 0004-qt6-only.patch, this isn't needed, |
|
|
|
|
|
# but we keep it since the patch is "technically" optional |
|
|
|
|
|
OPTIONS |
|
|
|
|
|
"QUAZIP_QT_MAJOR_VERSION 6" |
|
|
|
|
|
"QUAZIP_BZIP2 OFF" |
|
|
|
|
|
|
|
|
GIT_REPOSITORY "https://github.com/crueter/quazip-qt6.git" |
|
|
|
|
|
GIT_TAG v1.5-qt6 |
|
|
) |
|
|
) |
