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

Prefer Spicy include directories of this build over accidental ones.

Browse source 
Closes #3153.
This commit is contained in:
Benjamin Bannier 2023-06-27 14:41:45 +02:00
parent 64ebdec438
commit c718f7f632
4 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake

@ -1 +1 @@
Subproject commit afa62ecbe399c3dac41f6ebcdb622f409569edd6 Subproject commit 06e77e63a23e267c822e62df5ddbc4c720c93542

1
src/CMakeLists.txt
View file

@ -520,6 +520,7 @@ zeek_target_link_libraries(zeek_objs)
if (HAVE_SPICY) if (HAVE_SPICY)
target_link_libraries(zeek_objs PRIVATE hilti spicy) target_link_libraries(zeek_objs PRIVATE hilti spicy)
prefer_configured_spicy_include_dirs(zeek_objs)
endif () endif ()
if (TARGET zeek_exe) if (TARGET zeek_exe)

1
src/spicy/CMakeLists.txt
View file

@ -17,6 +17,7 @@ zeek_add_subdir_library(
spicy.bif) spicy.bif)
target_link_libraries(zeek_spicy_obj PRIVATE hilti spicy) target_link_libraries(zeek_spicy_obj PRIVATE hilti spicy)
prefer_configured_spicy_include_dirs(zeek_spicy_obj)
set(ZEEK_SPICY_MODULE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/zeek/spicy" CACHE PATH "") set(ZEEK_SPICY_MODULE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/zeek/spicy" CACHE PATH "")
install(DIRECTORY DESTINATION "${ZEEK_SPICY_MODULE_PATH}") install(DIRECTORY DESTINATION "${ZEEK_SPICY_MODULE_PATH}")

3
src/spicy/spicyz/CMakeLists.txt
View file

@ -7,7 +7,10 @@ add_executable(spicyz driver.cc glue-compiler.cc main.cc)
target_compile_options(spicyz PRIVATE "-Wall") target_compile_options(spicyz PRIVATE "-Wall")
target_compile_features(spicyz PRIVATE "${ZEEK_CXX_STD}") target_compile_features(spicyz PRIVATE "${ZEEK_CXX_STD}")
set_target_properties(spicyz PROPERTIES CXX_EXTENSIONS OFF) set_target_properties(spicyz PROPERTIES CXX_EXTENSIONS OFF)
target_include_directories(spicyz PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(spicyz PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(spicyz PRIVATE hilti spicy) target_link_libraries(spicyz PRIVATE hilti spicy)
prefer_configured_spicy_include_dirs(spicyz)
install(TARGETS spicyz DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS spicyz DESTINATION ${CMAKE_INSTALL_BINDIR})