From 1e51e82d599c301a04b445bfd5cac0207bdc046e Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 14 Jul 2025 16:18:25 -0400 Subject: [PATCH] fix quazip Signed-off-by: crueter --- externals/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index b2a1194f39..368273c83b 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -336,23 +336,27 @@ if (ARCHITECTURE_arm64 AND NOT TARGET sse2neon) target_include_directories(sse2neon INTERFACE sse2neon) endif() -include(CPM) -set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm) -set(CPM_USE_LOCAL_PACKAGES ON) - # QuaZip if (ENABLE_QT) set(QUAZIP_QT_MAJOR_VERSION 6) set(QUAZIP_BZIP2 OFF) + include(CPM) + set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm) + set(CPM_USE_LOCAL_PACKAGES ON) + CPMAddPackage( - URI "gh:stachenov/quazip@1.5" + NAME QuaZip-Qt6 + VERSION 1.3 + GIT_REPOSITORY "https://github.com/stachenov/quazip.git" + GIT_TAG v1.5 PATCHES ${CMAKE_SOURCE_DIR}/.ci/patch/0001-quazip-strict.patch ${CMAKE_SOURCE_DIR}/.ci/patch/0002-quazip-fetchcontent.patch ) - if (NOT MSVC) + if (NOT MSVC AND NOT "QuaZip-Qt6" IN_LIST CPM_PACKAGES) + message(STATUS "QUAZIP DIR: ${CPM_PACKAGES}") target_compile_options(QuaZip PRIVATE -Wno-error=shadow -Wno-error=missing-declarations