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

Fixed extern C issue with windows headers, fixed a GEN-ZAM regex issue, fixd compilation with c-ares

Browse source
This commit is contained in:
Tomer Lev 2022-09-18 15:04:06 +03:00
parent 98a0e242ad
commit 0c61bcbfcd
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -90,9 +90,10 @@ if ( MSVC )
# Set CAres # Set CAres
find_package(c-ares) find_package(c-ares)
set(HAVE_CARES true) set(HAVE_CARES true) # Disable FindCAres cmake file
set(zeekdeps ${zeekdeps} ${c-ares_LIBRARIES})
include_directories(BEFORE ${c-ares_INCLUDE_DIRS}) include_directories(BEFORE ${c-ares_INCLUDE_DIRS})
set(zeekdeps ${zeekdeps} ${c-ares_LIBRARIES})
add_definitions(-DCARES_STATICLIB)
add_subdirectory(auxil/libunistd) add_subdirectory(auxil/libunistd)
set(UNISTD_INCLUDES ${CMAKE_SOURCE_DIR}/auxil/libunistd/unistd ${CMAKE_SOURCE_DIR}/auxil/libunistd/regex) set(UNISTD_INCLUDES ${CMAKE_SOURCE_DIR}/auxil/libunistd/unistd ${CMAKE_SOURCE_DIR}/auxil/libunistd/regex)

1
src/CMakeLists.txt
View file

@ -533,6 +533,7 @@ if (ZEEK_STANDALONE)
${bro_PLUGIN_LIBS} ${bro_PLUGIN_LIBS}
) )
target_link_libraries(zeek ${bro_PLUGIN_LINK_LIBS} ${zeekdeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}) target_link_libraries(zeek ${bro_PLUGIN_LINK_LIBS} ${zeekdeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
# Export symbols from zeek executable for use by plugins # Export symbols from zeek executable for use by plugins
set_target_properties(zeek PROPERTIES ENABLE_EXPORTS TRUE) set_target_properties(zeek PROPERTIES ENABLE_EXPORTS TRUE)

1
src/telemetry/CMakeLists.txt
View file

@ -13,3 +13,4 @@ bif_target(telemetry.bif)
bro_add_subdir_library(telemetry ${telemetry_SRCS}) bro_add_subdir_library(telemetry ${telemetry_SRCS})
add_dependencies(bro_telemetry generate_outputs) add_dependencies(bro_telemetry generate_outputs)