mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-03 05:25:52 +00:00
Code Issues Releases Wiki Activity

Fix libdeflate find module never finding anything (#4968)

Browse source 
`DEFLATE_VERSION` was never set but was listed as required. Move it from
`REQUIRED_VARS` to `VERSION_VAR` and populate properly.
This commit is contained in:
Mike Gelfand 2023-02-21 00:09:24 +03:00 committed by GitHub
parent 6a185634b0
commit 88556bd859
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cmake/FindDEFLATE.cmake
View file

@ -10,7 +10,7 @@ endif()
if(UNIX) if(UNIX)
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
# pkg-config support added in libdeflate v1.9 # pkg-config support added in libdeflate v1.9
pkg_check_modules(_DEFLATE libdeflate>=${DEFLATE_MINIMUM}) pkg_check_modules(_DEFLATE QUIET libdeflate)
endif() endif()
find_path(DEFLATE_INCLUDE_DIR find_path(DEFLATE_INCLUDE_DIR
@ -22,7 +22,16 @@ find_library(DEFLATE_LIBRARY
set(DEFLATE_INCLUDE_DIRS ${DEFLATE_INCLUDE_DIR}) set(DEFLATE_INCLUDE_DIRS ${DEFLATE_INCLUDE_DIR})
set(DEFLATE_LIBRARIES ${DEFLATE_LIBRARY}) set(DEFLATE_LIBRARIES ${DEFLATE_LIBRARY})
set(DEFLATE_VERSION ${_DEFLATE_VERSION})
if(_DEFLATE_VERSION)
set(DEFLATE_VERSION ${_DEFLATE_VERSION})
elseif(DEFLATE_INCLUDE_DIR)
file(STRINGS "${DEFLATE_INCLUDE_DIR}/libdeflate.h" DEFLATE_VERSION_STR
REGEX "^#define[\t ]+LIBDEFLATE_VERSION_STRING[\t ]+\"[^\"]+\"")
if(DEFLATE_VERSION_STR MATCHES "\"([^\"]+)\"")
set(DEFLATE_VERSION "${CMAKE_MATCH_1}")
endif()
endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
@ -30,7 +39,7 @@ find_package_handle_standard_args(DEFLATE
REQUIRED_VARS REQUIRED_VARS
DEFLATE_INCLUDE_DIR DEFLATE_INCLUDE_DIR
DEFLATE_LIBRARY DEFLATE_LIBRARY
DEFLATE_VERSION) VERSION_VAR DEFLATE_VERSION)
mark_as_advanced(DEFLATE_INCLUDE_DIR DEFLATE_LIBRARY) mark_as_advanced(DEFLATE_INCLUDE_DIR DEFLATE_LIBRARY)