Skip to content

[windows] fix spicy build #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timwoj merged 2 commits into from
Apr 6, 2026
Merged

[windows] fix spicy build #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92057bb
[windows] fix spicy build
Mar 10, 2026
dd6f6ca
modify builtInSpicyAnalayzer
Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion BuiltInSpicyAnalyzer.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,28 @@ function (spicy_add_analyzer)
target_compile_features(${lib} PRIVATE ${ZEEK_CXX_STD})
set_target_properties(${lib} PROPERTIES CXX_EXTENSIONS OFF)

if (MSVC)
target_compile_options(${lib} PRIVATE /bigobj /wd4716)
endif ()

target_include_directories(${lib} PRIVATE ${SPICY_PLUGIN_PATH}/include
${SPICY_PLUGIN_BINARY_PATH}/include)
target_compile_definitions(${lib} PRIVATE HILTI_MANUAL_PREINIT)
target_link_libraries(${lib} hilti spicy $<BUILD_INTERFACE:zeek_internal>)

if (SPICY_ROOT_DIR)
target_link_libraries(${lib} PRIVATE hilti spicy $<BUILD_INTERFACE:zeek_internal>)
else ()
target_link_libraries(${lib} PRIVATE $<BUILD_INTERFACE:zeek_internal>)

if (BINARY_PACKAGING_MODE)
hilti_link_object_libraries_in_tree(${lib} PRIVATE)
spicy_link_object_libraries_in_tree(${lib} PRIVATE)
else ()
hilti_link_libraries_in_tree(${lib} PRIVATE)
spicy_link_libraries_in_tree(${lib} PRIVATE)
endif ()
endif ()

prefer_configured_spicy_include_dirs(${lib})

# Feed into the main Zeek target(s).
Expand Down
11 changes: 8 additions & 3 deletions ConfigureSpicyBuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@ set(_spicy_targets
spicy-dump)

include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-Wno-changes-meaning" _has_no_changes_meaning_flag)
if (NOT MSVC)
check_cxx_compiler_flag("-Wno-changes-meaning" _has_no_changes_meaning_flag)
endif ()

foreach (_target ${_spicy_targets})
# Spicy uses slightly less strict warnings than Zeek proper. Mute a few
# warnings for Spicy.
target_compile_options(${_target} PRIVATE -Wno-missing-braces -Wno-vla)
if (_has_no_changes_meaning_flag)
if (NOT MSVC)
target_compile_options(${_target} PRIVATE -Wno-missing-braces -Wno-vla)
endif ()

if (NOT MSVC AND _has_no_changes_meaning_flag)
# GCC 13 adds a new flag to check whether a symbol changes meaning. Due
# to an issue in one of the dependencies used by Spicy, this causes
# Zeek to fail to build on that compiler. Until this is fixed, ignore
Expand Down
Loading