From 178f6c6125dedae1b9cf45ad1d280de83ba8620c Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Wed, 25 Dec 2024 09:05:36 +0100 Subject: [PATCH] libmatroska2: use the system zlib if available It should always be there on Linux/macOS. --- libmatroska2/CMakeLists.txt | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/libmatroska2/CMakeLists.txt b/libmatroska2/CMakeLists.txt index 895e3785..0b0c88a7 100644 --- a/libmatroska2/CMakeLists.txt +++ b/libmatroska2/CMakeLists.txt @@ -6,19 +6,23 @@ option(CONFIG_LZO1X "Enable lzo (de)compression in libmatroska2" ON) option(CONFIG_NOCODEC_HELPER "Enable Vorbis frame durations in libmatroska2" ON) if (CONFIG_ZLIB) - include(FetchContent) + include(FindZLIB) - set(ZLIB_BUILD_EXAMPLES OFF) + if(NOT ZLIB_FOUND) + include(FetchContent) - FetchContent_Declare( - zlib - URL "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz" - URL_HASH SHA512=580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f - DOWNLOAD_EXTRACT_TIMESTAMP TRUE - ) + set(ZLIB_BUILD_EXAMPLES OFF) - FetchContent_MakeAvailable(zlib) - target_compile_definitions("zlib" PRIVATE NO_GZIP) + FetchContent_Declare( + zlib + URL "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz" + URL_HASH SHA512=580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + ) + + FetchContent_MakeAvailable(zlib) + target_compile_definitions("zlib" PRIVATE NO_GZIP) + endif() endif() set(matroska2_SOURCES @@ -47,7 +51,11 @@ target_include_directories("matroska2" target_include_directories("matroska2" PUBLIC $) if (CONFIG_ZLIB) - target_link_libraries("matroska2" PRIVATE $) + if(ZLIB_FOUND) + target_link_libraries("matroska2" PRIVATE $) + else() + target_link_libraries("matroska2" PRIVATE $) + endif() endif(CONFIG_ZLIB) if (CONFIG_LZO1X) add_subdirectory("minilzo")