Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 13:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CMakeLists: Fix OPENSSL_INCLUDE_DIR reference

Browse source 
Seems the intention was to always add OPENSSL_INCLUDE_DIR to the
zeek_dynamic_plugin_base target, but finding of the OpenSSL package
and setting OPENSSL_INCLUDE_DIR happens much later, so this was never
functional.

Relates to #3408 - this is the fix for Zeek 6.0.3, #3420 is the
better fix for the future.
This commit is contained in:
Arne Welzel 2023-11-22 10:25:10 +01:00
parent dbaa9bf33d
commit afa164984b
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -287,9 +287,6 @@ target_include_directories(
zeek_dynamic_plugin_base zeek_dynamic_plugin_base
INTERFACE $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> INTERFACE $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>) $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
if (OPENSSL_INCLUDE_DIR)
target_include_directories(zeek_dynamic_plugin_base INTERFACE "${OPENSSL_INCLUDE_DIR}")
endif ()
target_link_libraries(zeek_dynamic_plugin_base INTERFACE Threads::Threads) target_link_libraries(zeek_dynamic_plugin_base INTERFACE Threads::Threads)
add_library(Zeek::DynamicPluginBase ALIAS zeek_dynamic_plugin_base) add_library(Zeek::DynamicPluginBase ALIAS zeek_dynamic_plugin_base)
set_target_properties(zeek_dynamic_plugin_base PROPERTIES EXPORT_NAME DynamicPluginBase) set_target_properties(zeek_dynamic_plugin_base PROPERTIES EXPORT_NAME DynamicPluginBase)
@ -1033,6 +1030,9 @@ endif ()
# --with-openssl (which may be common). # --with-openssl (which may be common).
include_directories(BEFORE ${OPENSSL_INCLUDE_DIR}) include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
# Propagate non-standard OpenSSL includes to dynamic plugins.
target_include_directories(zeek_dynamic_plugin_base INTERFACE "${OPENSSL_INCLUDE_DIR}")
# Determine if libfts is external to libc, i.e. musl # Determine if libfts is external to libc, i.e. musl
find_package(FTS) find_package(FTS)
if (FTS_FOUND) if (FTS_FOUND)