build: bump libdeflate snapshot to 1.17 (#4596)

* build: bump libdeflate snapshot to 1.17

* Link to static libdeflate

Disable shared library and gzip program (both unused)

* Use platform-specific libdeflate library name

Co-authored-by: Mike Gelfand <mikedld@users.noreply.github.com>
This commit is contained in:
Charles Kerr 2023-01-15 09:55:16 -06:00 committed by GitHub
parent 096db96bca
commit 854e01e893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions

2
.gitmodules vendored
View File

@ -32,7 +32,7 @@
[submodule "third-party/libdeflate"]
path = third-party/libdeflate
url = https://github.com/transmission/libdeflate
branch = v1.11-plus-cmake
branch = v1.17.x
[submodule "third-party/libpsl"]
path = third-party/libpsl
url = https://github.com/transmission/libpsl.git

View File

@ -31,7 +31,7 @@ include(TrMacros)
set(CURL_MINIMUM 7.28.0)
set(WOLFSSL_MINIMUM 3.4)
set(DEFLATE_MINIMUM 1.10)
set(DEFLATE_MINIMUM 1.17)
set(EVENT2_MINIMUM 2.1.0)
set(GIOMM_MINIMUM 2.26.0)
set(GLIBMM_MINIMUM 2.60.0)
@ -435,8 +435,16 @@ endif()
set(THIRD_PARTY_DIR ${CMAKE_SOURCE_DIR}/third-party)
tr_add_external_auto_library(DEFLATE libdeflate deflate
TARGET deflate::deflate)
if(WIN32 AND NOT MINGW)
set(DEFLATE_LIB_NAME deflatestatic)
else()
set(DEFLATE_LIB_NAME deflate)
endif()
tr_add_external_auto_library(DEFLATE libdeflate ${DEFLATE_LIB_NAME}
TARGET deflate::deflate
CMAKE_ARGS
-DLIBDEFLATE_BUILD_SHARED_LIB=OFF
-DLIBDEFLATE_BUILD_GZIP=OFF)
if(NOT USE_SYSTEM_DEFLATE)
set(DEFLATE_VERSION ${DEFLATE_MINIMUM})
endif()

@ -1 +1 @@
Subproject commit 45029bc1bc42ff55a0a8d4223ba9d9e8ec0da0d3
Subproject commit bd925ae68e99f65d69f20181cb845aaba5c8f098