cleanup find_threads and find_pcap issues

Signed-off-by: Stephen L Arnold <sarnold@vctlabs.com>

Author: sarnold

CMakeLists.txt

@@ -24,6 +24,16 @@ project(
     LANGUAGES CXX
 )
 
+# Check the thread library info early as setting compiler flags seems to
+# interfere with the detection and causes CMAKE_THREAD_LIBS_INIT to not
+# include -lpthread when it should.
+if(LIBTINS_BUILD_TESTS)
+    if (NOT TARGET Threads::Threads)
+        find_package(Threads REQUIRED)
+    endif ()
+    set(LINK_LIBS ${LINK_LIBS} Threads::Threads)
+endif()
+
 # Compilation flags.
 IF(MSVC)
     # Don't always use Wall, since VC's /Wall is ridiculously verbose.

cmake/Modules/FindPCAP.cmake

@@ -73,7 +73,9 @@ endif (NOT PCAP_LINKS_SOLO)
 
 include(CheckFunctionExists)
 set(CMAKE_REQUIRED_LIBRARIES ${PCAP_LIBRARY})
-check_function_exists(pcap_get_pfring_id HAVE_PF_RING)
+# this is not actually used, is not part of normal libpcap, and
+# causes breakage in some build environments, eg, bookworm docker image
+#check_function_exists(pcap_get_pfring_id HAVE_PF_RING)
 check_function_exists(pcap_set_immediate_mode HAVE_PCAP_IMMEDIATE_MODE)
 check_function_exists(pcap_set_tstamp_precision HAVE_PCAP_TIMESTAMP_PRECISION)
 set(CMAKE_REQUIRED_LIBRARIES)

tests/src/CMakeLists.txt

@@ -6,9 +6,6 @@ INCLUDE_DIRECTORIES(
     ${PCAP_INCLUDE_DIR}
 )
 
-# Find pthread library
-FIND_PACKAGE(Threads REQUIRED)
-
 LINK_DIRECTORIES(
     ${GOOGLETEST_LIBRARY}
 )
@@ -104,4 +101,3 @@ IF(LIBTINS_ENABLE_DOT11)
         CREATE_TEST(wpa2_decrypt)
     ENDIF()
 ENDIF()
-

tox.ini

@@ -42,7 +42,7 @@ deps =
     ninja
 
 commands =
-    cmake -G {posargs:"Unix Makefiles"} -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX={env:PREFIX} -DLIBTINS_ENABLE_CXX11=ON -DLIBTINS_ENABLE_ACK_TRACKER=OFF -DLIBTINS_ENABLE_WPA2=OFF -DLIBTINS_ENABLE_DOT11=OFF
+    cmake -G {posargs:"Unix Makefiles"} -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX={env:PREFIX} -DLIBTINS_ENABLE_CXX11=ON -DLIBTINS_ENABLE_ACK_TRACKER=OFF -DLIBTINS_ENABLE_WPA2=OFF -DLIBTINS_ENABLE_DOT11=OFF -DLIBTINS_BUILD_TESTS=OFF
     cmake --build build -j 4 --target install
     bash -c 'ls -lh $PREFIX/*'