Merge remote-tracking branch 'origin/topic/neverlord/gh-3247'

* origin/topic/neverlord/gh-3247:
  Forward OpenSSL include path to plugins

CHANGES

@@ -1,3 +1,7 @@
+6.1.0-dev.351 | 2023-08-29 12:07:42 -0700
+
+  * Forward OpenSSL include path to plugins (Dominik Charousset, Corelight)
+
 6.1.0-dev.349 | 2023-08-29 09:11:21 -0700
 
   * CI: Add ubuntu 23.04 build (Tim Wojtulewicz, Corelight)

CMakeLists.txt

@@ -290,7 +290,8 @@ add_library(zeek_dynamic_plugin_base INTERFACE)
 target_include_directories(
     zeek_dynamic_plugin_base
     INTERFACE $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-              $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
+              $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src> "${OPENSSL_INCLUDE_DIR}")
+target_link_libraries(zeek_dynamic_plugin_base INTERFACE Threads::Threads)
 add_library(Zeek::DynamicPluginBase ALIAS zeek_dynamic_plugin_base)
 set_target_properties(zeek_dynamic_plugin_base PROPERTIES EXPORT_NAME DynamicPluginBase)
 install(TARGETS zeek_dynamic_plugin_base EXPORT ZeekTargets)
@@ -750,7 +751,7 @@ endif ()
 
 # Forward user-defined hint for OpenSSL to the plugins. Use a cache variable to
 # make sure this variable survives CMake re-runs. Note: This variable is picked
-# up in ZeekPluginConfig.cmake.in.
+# up in ZeekPluginConfig.cmake.in and ZeekConfig.cmake.in.
 if (OPENSSL_ROOT_DIR)
     set(ZeekOpenSSLHint "${OPENSSL_ROOT_DIR}" CACHE INTERNAL "" FORCE)
 elseif (DEFINED ENV{OPENSSL_ROOT_DIR})

VERSION

@@ -1 +1 @@
-6.1.0-dev.349
+6.1.0-dev.351

src/ZeekConfig.cmake.in

@@ -12,6 +12,12 @@ set(CMAKE_THREAD_PREFER_PTHREAD ON)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_dependency(Threads REQUIRED)
 
+# Find OpenSSL and Forward hints from Zeek's build config.
+set(ZeekOpenSSLHint "@ZeekOpenSSLHint@")
+if (ZeekOpenSSLHint AND NOT OPENSSL_ROOT_DIR)
+    set(OPENSSL_ROOT_DIR "${ZeekOpenSSLHint}" CACHE
+        PATH "Directory hint for finding OpenSSL" FORCE)
+endif ()
 find_dependency(OpenSSL REQUIRED)
 
 # In our MSVC build, we have these extra dependencies from Conan.