Refactor find module versions handling

This now enables using version ranges in all find modules and simplifies
code.

Author: petk

cmake/cmake/modules/FindACL.cmake

@@ -141,7 +141,7 @@ if(ACL_IS_BUILT_IN)
 else()
   set(_ACL_REQUIRED_VARS ACL_LIBRARY ACL_INCLUDE_DIR)
 
-  # Use pkgconf, if available on the system.
+  # Try pkg-config.
   find_package(PkgConfig QUIET)
   if(PKG_CONFIG_FOUND)
     pkg_check_modules(PC_ACL QUIET libacl)
@@ -169,17 +169,10 @@ else()
     string(APPEND _reason "ACL library not found. ")
   endif()
 
-  # Get version.
-  block(PROPAGATE ACL_VERSION)
-    # ACL headers don't provide version. Try pkgconf version, if found.
-    if(PC_ACL_VERSION AND ACL_INCLUDE_DIR)
-      cmake_path(COMPARE "${ACL_INCLUDE_DIR}" EQUAL "${PC_ACL_INCLUDEDIR}" isEqual)
-
-      if(isEqual)
-        set(ACL_VERSION ${PC_ACL_VERSION})
-      endif()
-    endif()
-  endblock()
+  # ACL headers don't provide version. Try pkg-config.
+  if(PC_ACL_VERSION AND ACL_INCLUDE_DIR IN_LIST PC_ACL_INCLUDE_DIRS)
+    set(ACL_VERSION ${PC_ACL_VERSION})
+  endif()
 
   _acl_check(_acl_works)
 
@@ -204,6 +197,7 @@ find_package_handle_standard_args(
     ${_ACL_REQUIRED_VARS}
     _acl_works
   VERSION_VAR ACL_VERSION
+  HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 

cmake/cmake/modules/FindApache.cmake

@@ -190,8 +190,7 @@ if(Apache_APR_CONFIG_EXECUTABLE)
   )
 endif()
 
-# Find the apr library (Apache portable runtime).
-# Use pkgconf, if available on the system.
+# Try pkg-config.
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_Apache_APR QUIET apr-1)
@@ -294,7 +293,7 @@ endif()
 
 # Get Apache version.
 block(PROPAGATE Apache_VERSION)
-  if(Apache_INCLUDE_DIR AND EXISTS ${Apache_INCLUDE_DIR}/ap_release.h)
+  if(EXISTS ${Apache_INCLUDE_DIR}/ap_release.h)
     file(
       STRINGS
       ${Apache_INCLUDE_DIR}/ap_release.h
@@ -397,6 +396,7 @@ find_package_handle_standard_args(
     Apache_APR_INCLUDE_DIR
     Apache_EXECUTABLE
   VERSION_VAR Apache_VERSION
+  HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 

cmake/cmake/modules/FindAppArmor.cmake

@@ -35,7 +35,7 @@ set_package_properties(
 
 set(_reason "")
 
-# Use pkgconf, if available on the system.
+# Try pkg-config.
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_AppArmor QUIET libapparmor)
@@ -77,21 +77,13 @@ if(NOT _apparmor_sanity_check)
   string(APPEND _reason "Sanity check failed: aa_change_profile not found. ")
 endif()
 
-# Get version.
-block(PROPAGATE AppArmor_VERSION)
-  # AppArmor headers don't provide version. Try pkgconf version, if found.
-  if(PC_AppArmor_VERSION)
-    cmake_path(
-      COMPARE
-      "${PC_AppArmor_INCLUDEDIR}" EQUAL "${AppArmor_INCLUDE_DIR}"
-      isEqual
-    )
-
-    if(isEqual)
-      set(AppArmor_VERSION ${PC_AppArmor_VERSION})
-    endif()
-  endif()
-endblock()
+# AppArmor headers don't provide version. Try pkg-config.
+if(
+  PC_AppArmor_VERSION
+  AND AppArmor_INCLUDE_DIR IN_LIST PC_AppArmor_INCLUDE_DIRS
+)
+  set(AppArmor_VERSION ${PC_AppArmor_VERSION})
+endif()
 
 mark_as_advanced(AppArmor_INCLUDE_DIR AppArmor_LIBRARY)
 
@@ -102,6 +94,7 @@ find_package_handle_standard_args(
     AppArmor_INCLUDE_DIR
     _apparmor_sanity_check
   VERSION_VAR AppArmor_VERSION
+  HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 

cmake/cmake/modules/FindArgon2.cmake

@@ -34,7 +34,7 @@ set_package_properties(
 
 set(_reason "")
 
-# Use pkgconf, if available on the system.
+# Try pkg-config.
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_Argon2 QUIET libargon2)
@@ -62,21 +62,10 @@ if(NOT Argon2_LIBRARY)
   string(APPEND _reason "Argon2 library (libargon2) not found. ")
 endif()
 
-# Get version.
-block(PROPAGATE Argon2_VERSION)
-  # Argon2 headers don't provide version. Try pkgconf version, if found.
-  if(PC_Argon2_VERSION)
-    cmake_path(
-      COMPARE
-      "${PC_Argon2_INCLUDEDIR}" EQUAL "${Argon2_INCLUDE_DIR}"
-      isEqual
-    )
-
-    if(isEqual)
-      set(Argon2_VERSION ${PC_Argon2_VERSION})
-    endif()
-  endif()
-endblock()
+# Argon2 headers don't provide version. Try pkg-config.
+if(PC_Argon2_VERSION AND Argon2_INCLUDE_DIR IN_LIST PC_Argon2_INCLUDE_DIRS)
+  set(Argon2_VERSION ${PC_Argon2_VERSION})
+endif()
 
 mark_as_advanced(Argon2_INCLUDE_DIR Argon2_LIBRARY)
 
@@ -86,6 +75,7 @@ find_package_handle_standard_args(
     Argon2_LIBRARY
     Argon2_INCLUDE_DIR
   VERSION_VAR Argon2_VERSION
+  HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 

cmake/cmake/modules/FindBerkeleyDB.cmake

@@ -155,6 +155,7 @@ find_package_handle_standard_args(
     BerkeleyDB_INCLUDE_DIR
     _berkeleydb_sanity_check
   VERSION_VAR BerkeleyDB_VERSION
+  HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 

cmake/cmake/modules/FindCapstone.cmake

@@ -5,19 +5,19 @@ Module defines the following `IMPORTED` target(s):
 
 * `Capstone::Capstone` - The package library, if found.
 
-Result variables:
+## Result variables
 
 * `Capstone_FOUND` - Whether the package has been found.
 * `Capstone_INCLUDE_DIRS` - Include directories needed to use this package.
 * `Capstone_LIBRARIES` - Libraries needed to link to the package library.
 * `Capstone_VERSION` - Package version, if found.
 
-Cache variables:
+## Cache variables
 
 * `Capstone_INCLUDE_DIR` - Directory containing package library headers.
 * `Capstone_LIBRARY` - The path to the package library.
 
-Hints:
+## Hints
 
 The `Capstone_ROOT` variable adds custom search path.
 #]=============================================================================]
@@ -34,7 +34,7 @@ set_package_properties(
 
 set(_reason "")
 
-# Use pkgconf, if available on the system.
+# Try pkg-config.
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_Capstone QUIET capstone)
@@ -72,19 +72,27 @@ block(PROPAGATE Capstone_VERSION)
       "^#[ \t]*define[ \t]+CS_(API_MAJOR|API_MINOR|VERSION_EXTRA)[ \t]+[0-9]+[ \t]*$"
     )
 
-    unset(Capstone_VERSION)
+    set(Capstone_VERSION)
 
     foreach(item CS_API_MAJOR CS_API_MINOR CS_VERSION_EXTRA)
       foreach(line ${results})
         if(line MATCHES "^#[ \t]*define[ \t]+${item}[ \t]+([0-9]+)[ \t]*$")
-          if(DEFINED Capstone_VERSION)
+          if(Capstone_VERSION)
             string(APPEND Capstone_VERSION ".${CMAKE_MATCH_1}")
           else()
             set(Capstone_VERSION "${CMAKE_MATCH_1}")
           endif()
         endif()
       endforeach()
     endforeach()
+
+    if(
+      NOT Capstone_VERSION
+      AND PC_Capstone_VERSION
+      AND Capstone_INCLUDE_DIR IN_LIST PC_Capstone_INCLUDE_DIRS
+    )
+      set(Capstone_VERSION ${PC_Capstone_VERSION})
+    endif()
   endif()
 endblock()
 
@@ -96,6 +104,7 @@ find_package_handle_standard_args(
     Capstone_LIBRARY
     Capstone_INCLUDE_DIR
   VERSION_VAR Capstone_VERSION
+  HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 
@@ -109,20 +118,20 @@ endif()
 # <capstone/capstone.h>. Here both include directories are added so the code can
 # work with both includes. The "subdir" can be removed and simplified in the
 # future. See: https://github.com/capstone-engine/capstone/issues/1982
-block(PROPAGATE Capstone_INCLUDE_DIRS Capstone_LIBRARIES)
-  set(subdir "${Capstone_INCLUDE_DIR}/capstone")
-
-  set(Capstone_INCLUDE_DIRS ${Capstone_INCLUDE_DIR} ${subdir})
-  set(Capstone_LIBRARIES ${Capstone_LIBRARY})
+set(
+  Capstone_INCLUDE_DIRS
+  ${Capstone_INCLUDE_DIR}
+  ${Capstone_INCLUDE_DIR}/capstone
+)
+set(Capstone_LIBRARIES ${Capstone_LIBRARY})
 
-  if(NOT TARGET Capstone::Capstone)
-    add_library(Capstone::Capstone UNKNOWN IMPORTED)
+if(NOT TARGET Capstone::Capstone)
+  add_library(Capstone::Capstone UNKNOWN IMPORTED)
 
-    set_target_properties(
-      Capstone::Capstone
-      PROPERTIES
-        IMPORTED_LOCATION "${Capstone_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${Capstone_INCLUDE_DIR};${subdir}"
-    )
-  endif()
-endblock()
+  set_target_properties(
+    Capstone::Capstone
+    PROPERTIES
+      IMPORTED_LOCATION "${Capstone_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES "${Capstone_INCLUDE_DIRS}"
+  )
+endif()

cmake/cmake/modules/FindCcache.cmake

@@ -60,6 +60,7 @@ find_package_handle_standard_args(
   REQUIRED_VARS
     Ccache_EXECUTABLE
   VERSION_VAR Ccache_VERSION
+  HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 

cmake/cmake/modules/FindCdb.cmake

@@ -35,7 +35,7 @@ set_package_properties(
 
 set(_reason "")
 
-# Use pkgconf, if available on the system.
+# Try pkg-config.
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_Cdb QUIET libcdb)
@@ -77,14 +77,11 @@ block(PROPAGATE Cdb_VERSION)
   if(Cdb_INCLUDE_DIR)
     set(regex [[^[ \t]*#[ \t]*define[ \t]+TINYCDB_VERSION[ \t]+([0-9.]+)[ \t]*$]])
 
-    file(STRINGS ${Cdb_INCLUDE_DIR}/cdb.h results REGEX "${regex}")
+    file(STRINGS ${Cdb_INCLUDE_DIR}/cdb.h result REGEX "${regex}")
 
-    foreach(line ${results})
-      if(line MATCHES "${regex}")
-        set(Cdb_VERSION "${CMAKE_MATCH_1}")
-        break()
-      endif()
-    endforeach()
+    if(result MATCHES "${regex}")
+      set(Cdb_VERSION "${CMAKE_MATCH_1}")
+    endif()
   endif()
 endblock()
 
@@ -97,6 +94,7 @@ find_package_handle_standard_args(
     Cdb_INCLUDE_DIR
     _cdb_sanity_check
   VERSION_VAR Cdb_VERSION
+  HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 

cmake/cmake/modules/FindCrypt.cmake

@@ -83,7 +83,7 @@ if(Crypt_IS_BUILT_IN)
 else()
   set(_Crypt_REQUIRED_VARS Crypt_LIBRARY Crypt_INCLUDE_DIR _Crypt_SANITY_CHECK)
 
-  # Use pkgconf, if available on the system.
+  # Try pkg-config.
   find_package(PkgConfig QUIET)
   if(PKG_CONFIG_FOUND)
     pkg_search_module(PC_Crypt QUIET libcrypt libxcrypt)
@@ -124,29 +124,22 @@ endif()
 
 # Get version.
 block(PROPAGATE Crypt_VERSION)
-  if(Crypt_INCLUDE_DIR AND EXISTS ${Crypt_INCLUDE_DIR}/crypt.h)
-    set(regex [[^[ \t]*#[ \t]*define[ \t]+XCRYPT_VERSION_STR[ \t]+"?([0-9.]+)"?[ \t]*$]])
+  if(EXISTS ${Crypt_INCLUDE_DIR}/crypt.h)
+    set(regex [[^[ \t]*#[ \t]*define[ \t]+XCRYPT_VERSION_STR[ \t]+"?([^"]+)"?[ \t]*$]])
 
-    file(STRINGS ${Crypt_INCLUDE_DIR}/crypt.h results REGEX "${regex}")
+    file(STRINGS ${Crypt_INCLUDE_DIR}/crypt.h result REGEX "${regex}")
 
-    foreach(line ${results})
-      if(line MATCHES "${regex}")
-        set(Crypt_VERSION "${CMAKE_MATCH_1}")
-        break()
-      endif()
-    endforeach()
+    if(result MATCHES "${regex}")
+      set(Crypt_VERSION "${CMAKE_MATCH_1}")
+    endif()
   endif()
 
-  if(NOT Crypt_VERSION AND PC_Crypt_VERSION)
-    cmake_path(
-      COMPARE
-      "${PC_Crypt_INCLUDEDIR}" EQUAL "${Crypt_INCLUDE_DIR}"
-      isEqual
-    )
-
-    if(isEqual)
-      set(Crypt_VERSION ${PC_Crypt_VERSION})
-    endif()
+  if(
+    NOT Crypt_VERSION
+    AND PC_Crypt_VERSION
+    AND Crypt_INCLUDE_DIR IN_LIST PC_Crypt_INCLUDE_DIRS
+  )
+    set(Crypt_VERSION ${PC_Crypt_VERSION})
   endif()
 endblock()
 
@@ -159,6 +152,7 @@ find_package_handle_standard_args(
   REQUIRED_VARS
     ${_Crypt_REQUIRED_VARS}
   VERSION_VAR Crypt_VERSION
+  HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 

cmake/cmake/modules/FindDmalloc.cmake

@@ -88,6 +88,7 @@ find_package_handle_standard_args(
     Dmalloc_LIBRARY
     Dmalloc_INCLUDE_DIR
   VERSION_VAR Dmalloc_VERSION
+  HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"
 )