From 46f8fe92c4de0d0be76b3c9e82b949e2fc8fc49b Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 20 Oct 2022 05:24:44 +0300 Subject: [PATCH] cmake: libdeflate now provides pkg-config file Signed-off-by: Ivailo Monev --- cmake/modules/FindLibDeflate.cmake | 32 ++++++++++++++++++------------ 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/cmake/modules/FindLibDeflate.cmake b/cmake/modules/FindLibDeflate.cmake index b0c0f245..c6ae5997 100644 --- a/cmake/modules/FindLibDeflate.cmake +++ b/cmake/modules/FindLibDeflate.cmake @@ -9,22 +9,28 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# libdeflate does not provide pkg-config files - find_package(PkgConfig REQUIRED) +pkg_check_modules(PC_LIBDEFLATE QUIET libdeflate) + +set(LIBDEFLATE_INCLUDES ${PC_LIBDEFLATE_INCLUDE_DIRS}) +set(LIBDEFLATE_LIBRARIES ${PC_LIBDEFLATE_LIBRARIES}) +set(LIBDEFLATE_VERSION ${PC_LIBDEFLATE_VERSION}) + +if(NOT LIBDEFLATE_INCLUDES OR NOT LIBDEFLATE_LIBRARIES) + find_path(LIBDEFLATE_INCLUDES + NAMES libdeflate.h + HINTS $ENV{LIBDEFLATEDIR}/include + ) + + find_library(LIBDEFLATE_LIBRARIES + NAMES deflate + HINTS $ENV{LIBDEFLATEDIR}/lib + ) +endif() + include(FindPackageHandleStandardArgs) - -find_path(LIBDEFLATE_INCLUDES - NAMES libdeflate.h - HINTS $ENV{LIBDEFLATEDIR}/include -) - -find_library(LIBDEFLATE_LIBRARIES - NAMES deflate - HINTS $ENV{LIBDEFLATEDIR}/lib -) - find_package_handle_standard_args(LibDeflate + VERSION_VAR LIBDEFLATE_VERSION REQUIRED_VARS LIBDEFLATE_LIBRARIES LIBDEFLATE_INCLUDES )