From 9a0ffaee7410f6e2e4196107181361b05cb8fcc6 Mon Sep 17 00:00:00 2001
From: chris1786 <22242927+chris1786@users.noreply.github.com>
Date: Wed, 15 Oct 2025 20:21:28 +0100
Subject: [PATCH] Abstract platform-specific linker flags required for
 threading support

---
 tools/hsbench/CMakeLists.txt |  6 +++---
 tools/hscheck/CMakeLists.txt | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/tools/hsbench/CMakeLists.txt b/tools/hsbench/CMakeLists.txt
index bbceda41c..16d530cb2 100644
--- a/tools/hsbench/CMakeLists.txt
+++ b/tools/hsbench/CMakeLists.txt
@@ -60,10 +60,10 @@ if (BUILD_CHIMERA)
     include_directories(${PCRE_INCLUDE_DIRS})
     if(NOT WIN32)
         target_link_libraries(hsbench hs chimera ${PCRE_LDFLAGS} databaseutil
-            expressionutil ${SQLITE3_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT})
+            expressionutil ${SQLITE3_LDFLAGS} Threads::Threads)
     else()
         target_link_libraries(hsbench hs chimera pcre databaseutil
-            expressionutil ${SQLITE3_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT})
+            expressionutil ${SQLITE3_LDFLAGS} Threads::Threads)
     endif()
 else()
     if(WIN32 AND (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS))
@@ -72,5 +72,5 @@ else()
         add_executable(hsbench ${hsbench_SOURCES})
     endif()
     target_link_libraries(hsbench hs databaseutil expressionutil
-        ${SQLITE3_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT})
+        ${SQLITE3_LDFLAGS} Threads::Threads)
 endif()
diff --git a/tools/hscheck/CMakeLists.txt b/tools/hscheck/CMakeLists.txt
index 2ae06137c..67181b2ee 100644
--- a/tools/hscheck/CMakeLists.txt
+++ b/tools/hscheck/CMakeLists.txt
@@ -11,9 +11,9 @@ if (BUILD_CHIMERA)
     add_definitions(-DHS_HYBRID)
     add_executable(hscheck ${hscheck_SOURCES})
     if(NOT WIN32)
-        target_link_libraries(hscheck hs chimera ${PCRE_LDFLAGS} expressionutil pthread)
+        target_link_libraries(hscheck hs chimera ${PCRE_LDFLAGS} expressionutil Threads::Threads)
     else()
-        target_link_libraries(hscheck hs chimera pcre expressionutil)
+        target_link_libraries(hscheck hs chimera pcre expressionutil Threads::Threads)
     endif()
 else()
     if(WIN32 AND (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS))
@@ -21,9 +21,5 @@ else()
     else()
         add_executable(hscheck ${hscheck_SOURCES})
     endif()
-    if(NOT WIN32)
-        target_link_libraries(hscheck hs expressionutil pthread)
-    else()
-        target_link_libraries(hscheck hs expressionutil)
-    endif()
+    target_link_libraries(hscheck hs expressionutil Threads::Threads)
 endif()