Browse Source

cmake: Fix naming to be clear we want the CLIENT version

Xenofon Karamanos 7 months ago
parent
commit
640bd4fb75

+ 0 - 36
cmake/modules/FindLibfreeradius.cmake

@@ -1,36 +0,0 @@
-# - Find freeradius-client
-# Find the native freeradius-client includes and library.
-# Once done this will define
-#
-#  LIBFREERADIUS_CLIENT_INCLUDE_DIRS - where to find freeradius-client.h, etc.
-#  LIBFREERADIUS_CLIENT_LIBRARIES    - List of libraries when using libfreeradius.
-#  LIBFREERADIUS_CLIENT_FOUND        - True if libfreeradius found.
-
-find_path(Libfreeradius_INCLUDE_DIR NAMES freeradius-client.h)
-
-find_library(
-  Libfreeradius_LIBRARY
-  NAMES freeradius-client freeradius-eap
-  PATH_SUFFIXES freeradius)
-
-mark_as_advanced(Libfreeradius_LIBRARY Libfreeradius_INCLUDE_DIR)
-
-# handle the QUIETLY and REQUIRED arguments and set LIBFREERADIUS_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
-  Libfreeradius REQUIRED_VARS LIBFREERADIUS_LIBRARY LIBFREERADIUS_INCLUDE_DIR)
-
-if(Libfreeradius_FOUND)
-  find_package_message(
-    Libfreeradius "Found Libfreeradius: ${LIBFREERADIUS_LIBRARY}"
-    "[${LIBFREERADIUS_LIBRARY}][${LIBFREERADIUS_INCLUDE_DIR}]")
-  set(LIBFREERADIUS_INCLUDE_DIRS ${LIBFREERADIUS_INCLUDE_DIR})
-  set(LIBFREERADIUS_LIBRARIES ${LIBFREERADIUS_LIBRARY})
-  add_library(Libfreeradius::LIBFREERADIUS UNKNOWN IMPORTED)
-  set_target_properties(
-    Libfreeradius::LIBFREERADIUS PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
-                                            "${LIBFREERADIUS_INCLUDE_DIR}")
-  set_target_properties(Libfreeradius::LIBFREERADIUS
-                        PROPERTIES IMPORTED_LOCATION "${LIBFREERADIUS_LIBRARY}")
-endif()

+ 42 - 0
cmake/modules/FindLibfreeradiusClient.cmake

@@ -0,0 +1,42 @@
+# - Find freeradius-client
+# Find the native freeradius-client includes and library.
+# Once done this will define
+#
+#  Target:
+#  LibfreeradiusClient::LIBFREERADIUS
+
+#  LibfreeradiusClient_INCLUDE_DIR(S) - where to find freeradius-client.h, etc.
+#  LibfreeradiusClient_LIBRARY(IES)    - List of libraries when using libfreeradius.
+#  LibfreeradiusClient_FOUND        - True if libfreeradius found.
+
+find_path(LibfreeradiusClient_INCLUDE_DIR NAMES freeradius-client.h)
+
+find_library(
+  LibfreeradiusClient_LIBRARY
+  NAMES freeradius-client freeradius-eap
+  PATH_SUFFIXES freeradius)
+
+mark_as_advanced(LibfreeradiusClient_LIBRARY LibfreeradiusClient_INCLUDE_DIR)
+
+# handle the QUIETLY and REQUIRED arguments and set LibfreeradiusClient_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  LibfreeradiusClient REQUIRED_VARS LibfreeradiusClient_LIBRARY
+                                    LibfreeradiusClient_INCLUDE_DIR)
+
+if(LibfreeradiusClient_FOUND)
+  find_package_message(
+    LibfreeradiusClient "Found Libfreeradius: ${LibfreeradiusClient_LIBRARY}"
+    "[${LibfreeradiusClient_LIBRARY}][${LibfreeradiusClient_INCLUDE_DIR}]")
+  set(LibfreeradiusClient_INCLUDE_DIRS ${LibfreeradiusClient_INCLUDE_DIR})
+  set(LibfreeradiusClient_LIBRARIES ${LibfreeradiusClient_LIBRARY})
+  add_library(LibfreeradiusClient::LIBFREERADIUS UNKNOWN IMPORTED)
+  set_target_properties(
+    LibfreeradiusClient::LIBFREERADIUS
+    PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
+               "${LibfreeradiusClient_INCLUDE_DIR}")
+  set_target_properties(
+    LibfreeradiusClient::LIBFREERADIUS
+    PROPERTIES IMPORTED_LOCATION "${LibfreeradiusClient_LIBRARY}")
+endif()

+ 3 - 2
cmake/modules/FindRadius.cmake

@@ -36,8 +36,9 @@ endif()
 if(${RADIUSCLIENT} STREQUAL "FREERADIUS")
   # - freeradius-client library
   set(RADIUSCLIENT_LIB USE_FREERADIUS)
-  find_package(Libfreeradius REQUIRED)
-  add_library(RadiusClient::RadiusClient ALIAS Libfreeradius::LIBFREERADIUS)
+  find_package(LibfreeradiusClient REQUIRED)
+  add_library(RadiusClient::RadiusClient ALIAS
+              LibfreeradiusClient::LIBFREERADIUS)
 elseif(${RADIUSCLIENT} STREQUAL "RADCLI")
   # - radcli library
   set(RADIUSCLIENT_LIB USE_RADCLI)