Merge branch 'topic/timw/use-cmake-variables-for-library-name-suffixes'

* topic/timw/use-cmake-variables-for-library-name-suffixes: Use CMake variables for shared/static library suffixes
zeek · Dec 12, 2024 · 0ae2977 · 0ae2977
2 parents 725914b + d38f51d
commit 0ae2977
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/FindCAres.cmake b/FindCAres.cmake
@@ -12,8 +12,10 @@ if (NOT HAVE_CARES)
         find_path(CARES_ROOT_DIR NAMES "include/ares.h")
 
         # Prefer linking statically but look for a shared library version too.
-        find_library(CARES_LIBRARIES NAMES libcares_static.a libcares.so
-                     HINTS ${CARES_ROOT_DIR}/lib)
+        find_library(
+            CARES_LIBRARIES NAMES "libcares_static${CMAKE_STATIC_LIBRARY_SUFFIX}"
+                                  "libcares${CMAKE_SHARED_LIBRARY_SUFFIX}"
+            HINTS ${CARES_ROOT_DIR}/lib)
 
         find_path(CARES_INCLUDE_DIRS NAMES "ares.h" HINTS ${CARES_ROOT_DIR}/include)
 

diff --git a/FindKqueue.cmake b/FindKqueue.cmake
@@ -12,8 +12,10 @@ if (NOT HAVE_KQUEUE)
         find_path(LIBKQUEUE_ROOT_DIR NAMES "include/sys/event.h")
 
         # Prefer linking statically but look for a shared library version too.
-        find_library(LIBKQUEUE_LIBRARIES NAMES libkqueue.a libkqueue.so
-                     HINTS ${LIBKQUEUE_ROOT_DIR}/lib)
+        find_library(
+            LIBKQUEUE_LIBRARIES NAMES "libkqueue${CMAKE_STATIC_LIBRARY_SUFFIX}"
+                                      "libkqueue${CMAKE_SHARED_LIBRARY_SUFFIX}"
+            HINTS ${LIBKQUEUE_ROOT_DIR}/lib)
 
         find_path(LIBKQUEUE_INCLUDE_DIRS NAMES "sys/event.h"
                   HINTS ${LIBKQUEUE_ROOT_DIR}/include/kqueue)