Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/zeromq-include-paths'

Browse source 
* origin/topic/timw/zeromq-include-paths:
  Remove unneeded include dirs in zeromq CMakeLists.txt
This commit is contained in:
Tim Wojtulewicz 2025-06-23 10:39:31 -07:00
commit 33b23ef4b1
4 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,7 @@
8.0.0-dev.491 | 2025-06-23 10:39:31 -0700
* Remove unneeded include dirs in zeromq CMakeLists.txt (Tim Wojtulewicz, Corelight)
8.0.0-dev.489 | 2025-06-23 10:36:38 -0700 8.0.0-dev.489 | 2025-06-23 10:36:38 -0700
* Deprecate BRO_PLUGIN_INSTALL_PATH constant (Tim Wojtulewicz, Corelight) * Deprecate BRO_PLUGIN_INSTALL_PATH constant (Tim Wojtulewicz, Corelight)
@ -8,6 +12,8 @@
* Fix clang-tidy warnings in headers (Tim Wojtulewicz, Corelight) * Fix clang-tidy warnings in headers (Tim Wojtulewicz, Corelight)
This entry is a large collection of commits.
* Change clang-tidy configuration to also scan headers (Tim Wojtulewicz, Corelight) * Change clang-tidy configuration to also scan headers (Tim Wojtulewicz, Corelight)
* Don't pass local source/binary directory to zeek_add_plugin for Redis backend (Tim Wojtulewicz, Corelight) * Don't pass local source/binary directory to zeek_add_plugin for Redis backend (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.489 8.0.0-dev.491

2
src/cluster/backend/zeromq/CMakeLists.txt
View file

@ -4,7 +4,7 @@ find_package(ZeroMQ REQUIRED)
zeek_add_plugin( zeek_add_plugin(
Zeek Cluster_Backend_ZeroMQ Zeek Cluster_Backend_ZeroMQ
INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZeroMQ_INCLUDE_DIRS} INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIRS}
DEPENDENCIES ${ZeroMQ_LIBRARIES} DEPENDENCIES ${ZeroMQ_LIBRARIES}
SOURCES Plugin.cc ZeroMQ-Proxy.cc ZeroMQ.cc SOURCES Plugin.cc ZeroMQ-Proxy.cc ZeroMQ.cc
BIFS cluster_backend_zeromq.bif) BIFS cluster_backend_zeromq.bif)

2
src/cluster/backend/zeromq/cluster_backend_zeromq.bif
View file

@ -1,5 +1,5 @@
%%{ %%{
#include "ZeroMQ.h" #include "zeek/cluster/backend/zeromq/ZeroMQ.h"
%%} %%}
function Cluster::Backend::ZeroMQ::spawn_zmq_proxy_thread%(%): bool function Cluster::Backend::ZeroMQ::spawn_zmq_proxy_thread%(%): bool