From 256a22d6020ece0a5d4ec8941d58361d34649c8c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 20 Oct 2022 05:32:31 +0300 Subject: [PATCH] libdeflate now provides pkg-config file Signed-off-by: Ivailo Monev --- cmake/modules/FindDBus.cmake | 5 ++--- cmake/modules/FindDeflate.cmake | 14 +++++++------- cmake/modules/FindExecInfo.cmake | 7 +++---- cmake/modules/FindFontconfig.cmake | 5 ++--- cmake/modules/FindICU.cmake | 5 ++--- cmake/modules/FindIntl.cmake | 5 ++--- cmake/modules/FindJansson.cmake | 5 ++--- cmake/modules/FindXdgUtils.cmake | 5 ++--- cmake/modules/FindxxHash.cmake | 5 ++--- cmake/modules/KatieBuildMacros.cmake | 2 +- cmake/modules/OptimizeHeaders.cmake | 2 +- 11 files changed, 26 insertions(+), 34 deletions(-) diff --git a/cmake/modules/FindDBus.cmake b/cmake/modules/FindDBus.cmake index 0640dddba..cf77f48ca 100644 --- a/cmake/modules/FindDBus.cmake +++ b/cmake/modules/FindDBus.cmake @@ -1,12 +1,11 @@ -# - Try to find D-Bus message bus system -# Once done this will define +# Try to find D-Bus message bus system, once done this will define: # # DBUS_FOUND - system has D-Bus message bus system # DBUS_INCLUDES - the D-Bus message bus system include directory # DBUS_ARCH_INCLUDES - the D-Bus message bus architecture include directory # DBUS_LIBRARIES - the libraries needed to use D-Bus message bus system # -# Copyright (C) 2015, Ivailo Monev, +# Copyright (C) 2015 Ivailo Monev # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/cmake/modules/FindDeflate.cmake b/cmake/modules/FindDeflate.cmake index c11130587..255f99690 100644 --- a/cmake/modules/FindDeflate.cmake +++ b/cmake/modules/FindDeflate.cmake @@ -1,30 +1,30 @@ -# - Try to find libdeflate -# Once done this will define +# Try to find libdeflate, once done this will define: # # DEFLATE_FOUND - system has libdeflate # DEFLATE_INCLUDES - the libdeflate include directory # DEFLATE_LIBRARIES - the libraries needed to use libdeflate # -# Copyright (C) 2022, Ivailo Monev, +# Copyright (C) 2022 Ivailo Monev # # Redistribution and use is allowed according to the terms of the BSD license. -# libdeflate does not provide pkg-config files - find_package(PkgConfig REQUIRED) include(FindPackageHandleStandardArgs) +pkg_check_modules(PC_DEFLATE QUIET libdeflate) + find_path(DEFLATE_INCLUDES NAMES libdeflate.h - HINTS $ENV{DEFLATEDIR}/include + HINTS $ENV{DEFLATEDIR}/include ${PC_DEFLATE_INCLUDEDIR} ) find_library(DEFLATE_LIBRARIES NAMES deflate - HINTS $ENV{DEFLATEDIR}/lib + HINTS $ENV{DEFLATEDIR}/lib ${PC_DEFLATE_LIBDIR} ) find_package_handle_standard_args(Deflate + VERSION_VAR PC_DEFLATE_VERSION REQUIRED_VARS DEFLATE_LIBRARIES DEFLATE_INCLUDES ) diff --git a/cmake/modules/FindExecInfo.cmake b/cmake/modules/FindExecInfo.cmake index 0bd5fa1ad..5f0cae3c0 100644 --- a/cmake/modules/FindExecInfo.cmake +++ b/cmake/modules/FindExecInfo.cmake @@ -1,15 +1,14 @@ -# - Try to find execinfo -# Once done this will define +# Try to find execinfo, once done this will define: # # EXECINFO_FOUND - system has execinfo # EXECINFO_INCLUDES - the execinfo include directory # EXECINFO_LIBRARIES - the libraries needed to use execinfo # -# Copyright (C) 2016, Ivailo Monev, +# Copyright (C) 2016 Ivailo Monev # # Redistribution and use is allowed according to the terms of the BSD license. -# execinfo does not provide pkg-config files +# execinfo does not provide pkg-config file include(CMakePushCheckState) include(FindPackageHandleStandardArgs) diff --git a/cmake/modules/FindFontconfig.cmake b/cmake/modules/FindFontconfig.cmake index c7f9a55bb..70ed6c364 100644 --- a/cmake/modules/FindFontconfig.cmake +++ b/cmake/modules/FindFontconfig.cmake @@ -1,11 +1,10 @@ -# - Try to find Fontconfig -# Once done this will define +# Try to find Fontconfig, once done this will define: # # FONTCONFIG_FOUND - system has Fontconfig # FONTCONFIG_INCLUDES - the Fontconfig include directory # FONTCONFIG_LIBRARIES - the libraries needed to use Fontconfig # -# Copyright (C) 2015, Ivailo Monev, +# Copyright (C) 2015 Ivailo Monev # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/cmake/modules/FindICU.cmake b/cmake/modules/FindICU.cmake index 8e11a84d5..397be03d6 100644 --- a/cmake/modules/FindICU.cmake +++ b/cmake/modules/FindICU.cmake @@ -1,11 +1,10 @@ -# - Try to find International Components for Unicode -# Once done this will define +# Try to find International Components for Unicode, once done this will define: # # ICU_FOUND - system has ICU # ICU_INCLUDES - the ICU include directory # ICU_LIBRARIES - the libraries needed to use ICU # -# Copyright (C) 2015, Ivailo Monev, +# Copyright (C) 2015 Ivailo Monev # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/cmake/modules/FindIntl.cmake b/cmake/modules/FindIntl.cmake index 884a026cc..384411373 100644 --- a/cmake/modules/FindIntl.cmake +++ b/cmake/modules/FindIntl.cmake @@ -1,12 +1,11 @@ -# - Try to find intl -# Once done this will define +# Try to find intl, once done this will define: # # INTL_FOUND - system has intl # INTL_INCLUDES - the intl include directory # INTL_LIBRARIES - the libraries needed to use intl # INTL_MSGFMT - the msgfmt binary # -# Copyright (C) 2016, Ivailo Monev, +# Copyright (C) 2016 Ivailo Monev # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/cmake/modules/FindJansson.cmake b/cmake/modules/FindJansson.cmake index 21935b6b1..82febb93d 100644 --- a/cmake/modules/FindJansson.cmake +++ b/cmake/modules/FindJansson.cmake @@ -1,11 +1,10 @@ -# - Try to find Jansson -# Once done this will define +# Try to find Jansson, once done this will define: # # JANSSON_FOUND - system has Jansson # JANSSON_INCLUDES - the Jansson include directory # JANSSON_LIBRARIES - the libraries needed to use Jansson # -# Copyright (C) 2021, Ivailo Monev, +# Copyright (C) 2021 Ivailo Monev # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/cmake/modules/FindXdgUtils.cmake b/cmake/modules/FindXdgUtils.cmake index 79c346191..ba5569285 100644 --- a/cmake/modules/FindXdgUtils.cmake +++ b/cmake/modules/FindXdgUtils.cmake @@ -1,10 +1,9 @@ -# - Try to find xdg-utils -# Once done this will define +# Try to find xdg-utils, once done this will define: # # XDGUTILS_FOUND - system has xdg-utils # XDGUTILS_OPEN - the xdg-open binary # -# Copyright (C) 2021, Ivailo Monev, +# Copyright (C) 2021 Ivailo Monev # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/cmake/modules/FindxxHash.cmake b/cmake/modules/FindxxHash.cmake index c12a57e4d..47191d87f 100644 --- a/cmake/modules/FindxxHash.cmake +++ b/cmake/modules/FindxxHash.cmake @@ -1,11 +1,10 @@ -# - Try to find xxHash -# Once done this will define +# Try to find xxHash, once done this will define: # # XXHASH_FOUND - system has xxHash # XXHASH_INCLUDES - the xxHash include directory # XXHASH_LIBRARIES - the libraries needed to use xxHash # -# Copyright (C) 2022, Ivailo Monev, +# Copyright (C) 2022 Ivailo Monev # # Redistribution and use is allowed according to the terms of the BSD license. diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index b2e16e6ef..6d550844a 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2015, Ivailo Monev, +# Copyright (C) 2015 Ivailo Monev # Redistribution and use is allowed according to the terms of the BSD license. # a function to append definitions to KATIE_DEFINITIONS which is stored in diff --git a/cmake/modules/OptimizeHeaders.cmake b/cmake/modules/OptimizeHeaders.cmake index bf4450014..d4b506034 100644 --- a/cmake/modules/OptimizeHeaders.cmake +++ b/cmake/modules/OptimizeHeaders.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2015, Ivailo Monev, +# Copyright (C) 2015 Ivailo Monev # Redistribution and use is allowed according to the terms of the BSD license. # UNIFDEF_EXECUTABLE and HEADERS_DIRECTORY origin from the macro call