diff --git a/.gitmodules b/.gitmodules index be4742f54..7d12321b4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,6 +35,7 @@ [submodule "third-party/libdeflate"] path = third-party/libdeflate url = https://github.com/transmission/libdeflate + branch = v1.10-plus-cmake [submodule "third-party/libpsl"] path = third-party/libpsl url = https://github.com/transmission/libpsl.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 04f7c3675..273215521 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,7 +117,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) set(PSL_MINIMUM 0.21.1) set(CURL_MINIMUM 7.28.0) set(CYASSL_MINIMUM 3.0) -set(DEFLATE_MINIMUM 1.9) +set(DEFLATE_MINIMUM 1.10) set(EVENT2_MINIMUM 2.1.0) set(GIO_MINIMUM 2.26.0) set(GLIB_MINIMUM 2.50.1) @@ -333,7 +333,7 @@ set(THIRD_PARTY_DIR ${CMAKE_SOURCE_DIR}/third-party) tr_add_external_auto_library(DEFLATE libdeflate deflate) if(NOT USE_SYSTEM_DEFLATE) - set(DEFLATE_VERSION 1.9) + set(DEFLATE_VERSION 1.10) endif() tr_add_external_auto_library(EVENT2 libevent event diff --git a/cmake/FindDEFLATE.cmake b/cmake/FindDEFLATE.cmake index 4d2988c56..806f2c267 100644 --- a/cmake/FindDEFLATE.cmake +++ b/cmake/FindDEFLATE.cmake @@ -9,7 +9,7 @@ endif() if(UNIX) find_package(PkgConfig QUIET) - # cmake supported added in libdeflate v1.9 + # pkg-config support added in libdeflate v1.9 pkg_check_modules(_DEFLATE libdeflate>=${DEFLATE_MINIMUM}) endif() diff --git a/third-party/libdeflate b/third-party/libdeflate index 0b8349a7e..d6d7a247e 160000 --- a/third-party/libdeflate +++ b/third-party/libdeflate @@ -1 +1 @@ -Subproject commit 0b8349a7ee3c5d6cb0def3c668a9079ce82af9b5 +Subproject commit d6d7a247ecad3219e9c5859a3091d77d28f89659