Find modules: Remove redundant result variables

These result variables were not clear enough at the beginning when
should be used and set. When using imported targets, such result
variables are redundant in find modules. If some case needs to get
all libraries or include directories, imported target properties should
be retrieved instead.

For example,
    get_target_property(result Foo::Foo INTERFACE_INCLUDE_DIRECTORIES)

Author: petk

cmake/cmake/modules/FindACL.cmake

@@ -4,7 +4,7 @@
 Finds the ACL library:
 
 ```cmake
-find_package(ACL)
+find_package(ACL [<version>] [...])
 ```
 
 ## Imported targets
@@ -15,10 +15,8 @@ This module defines the following imported targets:
 
 ## Result variables
 
-* `ACL_FOUND` - Whether the package has been found.
-* `ACL_INCLUDE_DIRS` - Include directories needed to use this package.
-* `ACL_LIBRARIES` - Libraries needed to link to the package library.
-* `ACL_VERSION` - Package version, if found.
+* `ACL_FOUND` - Boolean indicating whether the package is found.
+* `ACL_VERSION` - The version of package found.
 
 ## Cache variables
 
@@ -228,22 +226,14 @@ if(NOT ACL_FOUND)
   return()
 endif()
 
-if(ACL_IS_BUILT_IN)
-  set(ACL_INCLUDE_DIRS "")
-  set(ACL_LIBRARIES "")
-else()
-  set(ACL_INCLUDE_DIRS ${ACL_INCLUDE_DIR})
-  set(ACL_LIBRARIES ${ACL_LIBRARY})
-endif()
-
 if(NOT TARGET ACL::ACL)
   add_library(ACL::ACL UNKNOWN IMPORTED)
 
-  if(ACL_INCLUDE_DIRS)
+  if(ACL_INCLUDE_DIR)
     set_target_properties(
       ACL::ACL
       PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${ACL_INCLUDE_DIRS}"
+        INTERFACE_INCLUDE_DIRECTORIES "${ACL_INCLUDE_DIR}"
     )
   endif()
 

cmake/cmake/modules/FindApache.cmake

@@ -4,7 +4,7 @@
 Finds the Apache packages and tools:
 
 ```cmake
-find_package(Apache)
+find_package(Apache [<version>] [...])
 ```
 
 The Apache development package usually contains Apache header files, the `apr`
@@ -19,10 +19,8 @@ This module defines the following imported targets:
 
 ## Result variables
 
-* `Apache_FOUND` - Whether the package has been found.
-* `Apache_INCLUDE_DIRS` - Include directories needed to use this package.
-* `Apache_LIBRARIES` - Libraries needed to link to the package library.
-* `Apache_VERSION` - Package version, if found.
+* `Apache_FOUND` - Boolean indicating whether the package is found.
+* `Apache_VERSION` - The version of package found.
 * `Apache_THREADED` - Whether Apache requires thread safety.
 * `Apache_LIBEXECDIR` - Path to the directory containing all Apache modules and
   `httpd.exp` file (list of exported symbols).
@@ -410,17 +408,14 @@ if(NOT Apache_FOUND)
   return()
 endif()
 
-set(Apache_INCLUDE_DIRS ${Apache_INCLUDE_DIR} ${Apache_APR_INCLUDE_DIR})
-set(Apache_LIBRARIES ${Apache_APR_LIBRARY})
-
 if(NOT TARGET Apache::Apache)
   add_library(Apache::Apache INTERFACE IMPORTED)
 
   set_target_properties(
     Apache::Apache
     PROPERTIES
-      INTERFACE_LINK_LIBRARIES "${Apache_LIBRARIES}"
-      INTERFACE_INCLUDE_DIRECTORIES "${Apache_INCLUDE_DIRS}"
+      INTERFACE_LINK_LIBRARIES "${Apache_APR_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES "${Apache_INCLUDE_DIR};${Apache_APR_INCLUDE_DIR}"
   )
 
   target_compile_definitions(

cmake/cmake/modules/FindAppArmor.cmake

@@ -4,7 +4,7 @@
 Finds the AppArmor library:
 
 ```cmake
-find_package(AppArmor)
+find_package(AppArmor [<version>] [...])
 ```
 
 ## Imported targets
@@ -15,10 +15,8 @@ This module defines the following imported targets:
 
 ## Result variables
 
-* `AppArmor_FOUND` - Whether the package has been found.
-* `AppArmor_INCLUDE_DIRS` - Include directories needed to use this package.
-* `AppArmor_LIBRARIES` - Libraries needed to link to the package library.
-* `AppArmor_VERSION` - Package version, if found.
+* `AppArmor_FOUND` - Boolean indicating whether the package is found.
+* `AppArmor_VERSION` - The version of package found.
 
 ## Cache variables
 
@@ -120,9 +118,6 @@ if(NOT AppArmor_FOUND)
   return()
 endif()
 
-set(AppArmor_INCLUDE_DIRS ${AppArmor_INCLUDE_DIR})
-set(AppArmor_LIBRARIES ${AppArmor_LIBRARY})
-
 if(NOT TARGET AppArmor::AppArmor)
   if(IS_ABSOLUTE "${AppArmor_LIBRARY}")
     add_library(AppArmor::AppArmor UNKNOWN IMPORTED)
@@ -144,6 +139,6 @@ if(NOT TARGET AppArmor::AppArmor)
   set_target_properties(
     AppArmor::AppArmor
     PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${AppArmor_INCLUDE_DIRS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${AppArmor_INCLUDE_DIR}"
   )
 endif()

cmake/cmake/modules/FindArgon2.cmake

@@ -4,7 +4,7 @@
 Finds the Argon2 library:
 
 ```cmake
-find_package(Argon2)
+find_package(Argon2 [<version>] [...])
 ```
 
 ## Imported targets
@@ -15,10 +15,8 @@ This module defines the following imported targets:
 
 ## Result variables
 
-* `Argon2_FOUND` - Whether the package has been found.
-* `Argon2_INCLUDE_DIRS` - Include directories needed to use this package.
-* `Argon2_LIBRARIES` - Libraries needed to link to the package library.
-* `Argon2_VERSION` - Package version, if found.
+* `Argon2_FOUND` - Boolean indicating whether the package is found.
+* `Argon2_VERSION` - The version of package found.
 
 ## Cache variables
 
@@ -142,9 +140,6 @@ if(NOT Argon2_FOUND)
   return()
 endif()
 
-set(Argon2_INCLUDE_DIRS ${Argon2_INCLUDE_DIR})
-set(Argon2_LIBRARIES ${Argon2_LIBRARY})
-
 if(NOT TARGET Argon2::Argon2)
   if(IS_ABSOLUTE "${Argon2_LIBRARY}")
     add_library(Argon2::Argon2 UNKNOWN IMPORTED)
@@ -166,6 +161,6 @@ if(NOT TARGET Argon2::Argon2)
   set_target_properties(
     Argon2::Argon2
     PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${Argon2_INCLUDE_DIRS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${Argon2_INCLUDE_DIR}"
   )
 endif()

cmake/cmake/modules/FindAtomic.cmake

@@ -16,8 +16,6 @@ This module defines the following imported targets:
 ## Result variables
 
 * `Atomic_FOUND` - Whether atomic instructions are available.
-* `Atomic_LIBRARIES` - A list of libraries needed in order to use atomic
-  functionality.
 
 ## Examples
 
@@ -66,7 +64,7 @@ if(_atomic_found OR _atomic_found_in_library)
 endif()
 
 if(_atomic_found_in_library)
-  list(APPEND ATOMIC_LIBRARIES atomic)
+  set(Atomic_LIBRARY atomic)
 endif()
 
 find_package_handle_standard_args(
@@ -86,6 +84,6 @@ if(NOT TARGET Atomic::Atomic)
   set_target_properties(
     Atomic::Atomic
     PROPERTIES
-      INTERFACE_LINK_LIBRARIES "${Atomic_LIBRARIES}"
+      INTERFACE_LINK_LIBRARIES "${Atomic_LIBRARY}"
   )
 endif()

cmake/cmake/modules/FindBerkeleyDB.cmake

@@ -4,7 +4,7 @@
 Finds the Berkeley DB library:
 
 ```cmake
-find_package(BerkeleyDB)
+find_package(BerkeleyDB [<version>] [...])
 ```
 
 ## Imported targets
@@ -15,10 +15,8 @@ This module defines the following imported targets:
 
 ## Result variables
 
-* `BerkeleyDB_FOUND` - Whether the package has been found.
-* `BerkeleyDB_INCLUDE_DIRS` - Include directories needed to use this package.
-* `BerkeleyDB_LIBRARIES` - Libraries needed to link to the package library.
-* `BerkeleyDB_VERSION` - Package version, if found.
+* `BerkeleyDB_FOUND` - Boolean indicating whether the package is found.
+* `BerkeleyDB_VERSION` - The version of package found.
 
 ## Cache variables
 
@@ -182,14 +180,6 @@ if(NOT BerkeleyDB_FOUND)
   return()
 endif()
 
-set(
-  BerkeleyDB_INCLUDE_DIRS
-  ${BerkeleyDB_INCLUDE_DIR}
-  ${BerkeleyDB_DB1_INCLUDE_DIR}
-)
-list(REMOVE_DUPLICATES BerkeleyDB_INCLUDE_DIRS)
-set(BerkeleyDB_LIBRARIES ${BerkeleyDB_LIBRARY})
-
 if(NOT TARGET BerkeleyDB::BerkeleyDB)
   if(IS_ABSOLUTE "${BerkeleyDB_LIBRARY}")
     add_library(BerkeleyDB::BerkeleyDB UNKNOWN IMPORTED)
@@ -208,9 +198,10 @@ if(NOT TARGET BerkeleyDB::BerkeleyDB)
     )
   endif()
 
-  set_target_properties(
-    BerkeleyDB::BerkeleyDB
-    PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${BerkeleyDB_INCLUDE_DIRS}"
+  set_property(
+    TARGET BerkeleyDB::BerkeleyDB
+    PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+      ${BerkeleyDB_INCLUDE_DIR}
+      ${BerkeleyDB_DB1_INCLUDE_DIR}
   )
 endif()

cmake/cmake/modules/FindCapstone.cmake

@@ -4,7 +4,7 @@
 Finds the Capstone library:
 
 ```cmake
-find_package(Capstone)
+find_package(Capstone [<version>] [...])
 ```
 
 ## Imported targets
@@ -15,10 +15,8 @@ This module defines the following imported targets:
 
 ## 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.
+* `Capstone_FOUND` - Boolean indicating whether the package is found.
+* `Capstone_VERSION` - The version of package found.
 
 ## Cache variables
 
@@ -128,17 +126,6 @@ if(NOT Capstone_FOUND)
   return()
 endif()
 
-# Capstone might be included with <capstone.h> instead of the recommended
-# <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
-set(
-  Capstone_INCLUDE_DIRS
-  ${Capstone_INCLUDE_DIR}
-  ${Capstone_INCLUDE_DIR}/capstone
-)
-set(Capstone_LIBRARIES ${Capstone_LIBRARY})
-
 if(NOT TARGET Capstone::Capstone)
   if(IS_ABSOLUTE "${Capstone_LIBRARY}")
     add_library(Capstone::Capstone UNKNOWN IMPORTED)
@@ -157,9 +144,15 @@ if(NOT TARGET Capstone::Capstone)
     )
   endif()
 
-  set_target_properties(
-    Capstone::Capstone
-    PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${Capstone_INCLUDE_DIRS}"
+  set_property(
+    TARGET Capstone::Capstone
+    PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+      ${Capstone_INCLUDE_DIR}
+      # Capstone might be included with <capstone.h> instead of the recommended
+      # <capstone/capstone.h>. Here both include directories are added so the
+      # code can work with both includes. The following "subdir" can be removed
+      # and simplified in the future.
+      # See: https://github.com/capstone-engine/capstone/issues/1982
+      ${Capstone_INCLUDE_DIR}/capstone
   )
 endif()

cmake/cmake/modules/FindCcache.cmake

@@ -4,13 +4,13 @@
 Finds the Ccache compiler cache tool for faster compilation times:
 
 ```cmake
-find_package(Ccache)
+find_package(Ccache [<version>] [...])
 ```
 
 ## Result variables
 
-* `Ccache_FOUND` - Whether the package has been found.
-* `Ccache_VERSION` - Package version, if found.
+* `Ccache_FOUND` - Boolean indicating whether the package is found.
+* `Ccache_VERSION` - The version of package found.
 
 ## Cache variables
 

cmake/cmake/modules/FindCclient.cmake

@@ -19,9 +19,7 @@ This module defines the following imported targets:
 
 ## Result variables
 
-* `Cclient_FOUND` - Whether the package has been found.
-* `Cclient_INCLUDE_DIRS` - Include directories needed to use this package.
-* `Cclient_LIBRARIES` - Libraries needed to link to the package library.
+* `Cclient_FOUND` - Boolean indicating whether the package is found.
 * `HAVE_IMAP2000` - Whether c-client version is 2000 or newer. If true,
   c-client.h should be included instead of only rfc822.h on prior versions.
 * `HAVE_IMAP2001` - Whether c-client version is 2001 to 2004.
@@ -354,17 +352,14 @@ endif()
 # Post-find configuration.
 ################################################################################
 
-set(Cclient_INCLUDE_DIRS ${Cclient_INCLUDE_DIR})
-set(Cclient_LIBRARIES ${Cclient_LIBRARY})
-
 if(NOT TARGET Cclient::Cclient)
   add_library(Cclient::Cclient UNKNOWN IMPORTED)
 
   set_target_properties(
     Cclient::Cclient
     PROPERTIES
       IMPORTED_LOCATION "${Cclient_LIBRARY}"
-      INTERFACE_INCLUDE_DIRECTORIES "${Cclient_INCLUDE_DIRS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${Cclient_INCLUDE_DIR}"
   )
 endif()
 

cmake/cmake/modules/FindCdb.cmake

@@ -4,7 +4,7 @@
 Finds the cdb library:
 
 ```cmake
-find_package(Cdb)
+find_package(Cdb [<version>] [...])
 ```
 
 ## Imported targets
@@ -15,10 +15,8 @@ This module defines the following imported targets:
 
 ## Result variables
 
-* `Cdb_FOUND` - Whether the package has been found.
-* `Cdb_INCLUDE_DIRS` - Include directories needed to use this package.
-* `Cdb_LIBRARIES` - Libraries needed to link to the package library.
-* `Cdb_VERSION` - Package version, if found.
+* `Cdb_FOUND` - Boolean indicating whether the package is found.
+* `Cdb_VERSION` - The version of package found.
 
 ## Cache variables
 
@@ -125,16 +123,13 @@ if(NOT Cdb_FOUND)
   return()
 endif()
 
-set(Cdb_INCLUDE_DIRS ${Cdb_INCLUDE_DIR})
-set(Cdb_LIBRARIES ${Cdb_LIBRARY})
-
 if(NOT TARGET Cdb::Cdb)
   add_library(Cdb::Cdb UNKNOWN IMPORTED)
 
   set_target_properties(
     Cdb::Cdb
     PROPERTIES
       IMPORTED_LOCATION "${Cdb_LIBRARY}"
-      INTERFACE_INCLUDE_DIRECTORIES "${Cdb_INCLUDE_DIRS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${Cdb_INCLUDE_DIR}"
   )
 endif()