From 0e0fe0bbedf3bd0f8562a72ef12ba65b990cb0df Mon Sep 17 00:00:00 2001 From: zhaona45 Date: Tue, 6 Jan 2026 14:48:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E8=AF=91=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E6=94=AF=E6=8C=81=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaona45 Change-Id: Iaeff416b1e778623fbd4edffecc6e12d70824d1d --- cmake/DeflateCodec.cmake | 16 +++++------ cmake/JBIGCodec.cmake | 28 +++++++++---------- cmake/LERCCodec.cmake | 10 +++---- cmake/LZMACodec.cmake | 10 +++---- cmake/WebPCodec.cmake | 10 +++---- cmake/ZSTDCodec.cmake | 58 ++++++++++++++++++++-------------------- 6 files changed, 66 insertions(+), 66 deletions(-) diff --git a/cmake/DeflateCodec.cmake b/cmake/DeflateCodec.cmake index 76e5673e..a2e9f643 100644 --- a/cmake/DeflateCodec.cmake +++ b/cmake/DeflateCodec.cmake @@ -35,11 +35,11 @@ set(ZIP_SUPPORT ${ZLIB_SUPPORT}) # libdeflate set(LIBDEFLATE_SUPPORT FALSE) -find_package(Deflate) -option(libdeflate "use libdeflate (optional for faster Deflate support, still requires zlib)" ${Deflate_FOUND}) -if (libdeflate AND Deflate_FOUND AND ZIP_SUPPORT) - set(LIBDEFLATE_SUPPORT TRUE) -endif() -if(Deflate_FOUND AND NOT ZIP_SUPPORT) - message(WARNING "libdeflate available but zlib is not. libdeflate cannot be used") -endif() +# find_package(Deflate) +# option(libdeflate "use libdeflate (optional for faster Deflate support, still requires zlib)" ${Deflate_FOUND}) +# if (libdeflate AND Deflate_FOUND AND ZIP_SUPPORT) +# set(LIBDEFLATE_SUPPORT TRUE) +# endif() +# if(Deflate_FOUND AND NOT ZIP_SUPPORT) +# message(WARNING "libdeflate available but zlib is not. libdeflate cannot be used") +# endif() diff --git a/cmake/JBIGCodec.cmake b/cmake/JBIGCodec.cmake index a4350028..5de74b7b 100644 --- a/cmake/JBIGCodec.cmake +++ b/cmake/JBIGCodec.cmake @@ -27,21 +27,21 @@ # JBIG-KIT set(JBIG_SUPPORT FALSE) -find_package(JBIG) +# find_package(JBIG) -if(JBIG_FOUND) - set(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${JBIG_INCLUDE_DIRS}) - set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${JBIG_LIBRARIES}) - check_symbol_exists(jbg_newlen "jbig.h" HAVE_JBG_NEWLEN) - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE}) -endif() +# if(JBIG_FOUND) +# set(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) +# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${JBIG_INCLUDE_DIRS}) +# set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) +# set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${JBIG_LIBRARIES}) +# check_symbol_exists(jbg_newlen "jbig.h" HAVE_JBG_NEWLEN) +# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) +# set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE}) +# endif() -option(jbig "use ISO JBIG compression (requires JBIT-KIT library)" ${JBIG_FOUND}) +# option(jbig "use ISO JBIG compression (requires JBIT-KIT library)" ${JBIG_FOUND}) -if (jbig AND JBIG_FOUND) - set(JBIG_SUPPORT TRUE) -endif() +# if (jbig AND JBIG_FOUND) +# set(JBIG_SUPPORT TRUE) +# endif() diff --git a/cmake/LERCCodec.cmake b/cmake/LERCCodec.cmake index 54504ca1..f13ca214 100644 --- a/cmake/LERCCodec.cmake +++ b/cmake/LERCCodec.cmake @@ -25,8 +25,8 @@ # libLerc set(LERC_SUPPORT FALSE) -find_package(LERC) -option(lerc "use libLerc (required for LERC compression)" ${LERC_FOUND}) -if (lerc AND LERC_FOUND AND ZIP_SUPPORT) - set(LERC_SUPPORT TRUE) -endif() +# find_package(LERC) +# option(lerc "use libLerc (required for LERC compression)" ${LERC_FOUND}) +# if (lerc AND LERC_FOUND AND ZIP_SUPPORT) +# set(LERC_SUPPORT TRUE) +# endif() diff --git a/cmake/LZMACodec.cmake b/cmake/LZMACodec.cmake index c51afe82..95417fe2 100644 --- a/cmake/LZMACodec.cmake +++ b/cmake/LZMACodec.cmake @@ -26,9 +26,9 @@ # liblzma2 set(LZMA_SUPPORT FALSE) -find_package(liblzma) +# find_package(liblzma) -option(lzma "use liblzma (required for LZMA2 compression)" ${LIBLZMA_FOUND}) -if (lzma AND LIBLZMA_FOUND) - set(LZMA_SUPPORT TRUE) -endif() +# option(lzma "use liblzma (required for LZMA2 compression)" ${LIBLZMA_FOUND}) +# if (lzma AND LIBLZMA_FOUND) +# set(LZMA_SUPPORT TRUE) +# endif() diff --git a/cmake/WebPCodec.cmake b/cmake/WebPCodec.cmake index 1d676a78..b11510cb 100644 --- a/cmake/WebPCodec.cmake +++ b/cmake/WebPCodec.cmake @@ -26,10 +26,10 @@ # libwebp set(WEBP_SUPPORT FALSE) -find_package(WebP) +# find_package(WebP) -option(webp "use libwebp (required for WEBP compression)" ${WebP_FOUND}) +# option(webp "use libwebp (required for WEBP compression)" ${WebP_FOUND}) -if (webp AND WebP_FOUND) - set(WEBP_SUPPORT TRUE) -endif() +# if (webp AND WebP_FOUND) +# set(WEBP_SUPPORT TRUE) +# endif() diff --git a/cmake/ZSTDCodec.cmake b/cmake/ZSTDCodec.cmake index 3fac861a..31ee30e9 100644 --- a/cmake/ZSTDCodec.cmake +++ b/cmake/ZSTDCodec.cmake @@ -28,37 +28,37 @@ set(ZSTD_SUPPORT FALSE) set(ZSTD_USABLE FALSE) -find_package(ZSTD) +# find_package(ZSTD) -if(ZSTD_FOUND) - if(TARGET zstd::libzstd_shared) - add_library(ZSTD::ZSTD ALIAS zstd::libzstd_shared) - set(ZSTD_HAVE_DECOMPRESS_STREAM ON) - elseif(TARGET zstd::libzstd_static) - add_library(ZSTD::ZSTD ALIAS zstd::libzstd_static) - set(ZSTD_HAVE_DECOMPRESS_STREAM ON) - endif() +# if(ZSTD_FOUND) +# if(TARGET zstd::libzstd_shared) +# add_library(ZSTD::ZSTD ALIAS zstd::libzstd_shared) +# set(ZSTD_HAVE_DECOMPRESS_STREAM ON) +# elseif(TARGET zstd::libzstd_static) +# add_library(ZSTD::ZSTD ALIAS zstd::libzstd_static) +# set(ZSTD_HAVE_DECOMPRESS_STREAM ON) +# endif() - if(NOT DEFINED ZSTD_HAVE_DECOMPRESS_STREAM) - set(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZSTD_INCLUDE_DIRS}) - set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZSTD_LIBRARIES}) - check_symbol_exists(ZSTD_decompressStream "zstd.h" ZSTD_HAVE_DECOMPRESS_STREAM) - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE}) - endif() - set(ZSTD_RECENT_ENOUGH ${ZSTD_HAVE_DECOMPRESS_STREAM}) +# if(NOT DEFINED ZSTD_HAVE_DECOMPRESS_STREAM) +# set(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) +# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZSTD_INCLUDE_DIRS}) +# set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) +# set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZSTD_LIBRARIES}) +# check_symbol_exists(ZSTD_decompressStream "zstd.h" ZSTD_HAVE_DECOMPRESS_STREAM) +# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) +# set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE}) +# endif() +# set(ZSTD_RECENT_ENOUGH ${ZSTD_HAVE_DECOMPRESS_STREAM}) - if (ZSTD_RECENT_ENOUGH) - set(ZSTD_USABLE TRUE) - else() - message(WARNING "Found ZSTD library, but not recent enough. Use zstd >= 1.0") - endif() -endif() +# if (ZSTD_RECENT_ENOUGH) +# set(ZSTD_USABLE TRUE) +# else() +# message(WARNING "Found ZSTD library, but not recent enough. Use zstd >= 1.0") +# endif() +# endif() -option(zstd "use libzstd (required for ZSTD compression)" ${ZSTD_USABLE}) +# option(zstd "use libzstd (required for ZSTD compression)" ${ZSTD_USABLE}) -if (zstd AND ZSTD_USABLE) - set(ZSTD_SUPPORT TRUE) -endif() +# if (zstd AND ZSTD_USABLE) +# set(ZSTD_SUPPORT TRUE) +# endif()