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/robin/gh-4301-with-spicy'

Browse source 
* origin/topic/robin/gh-4301-with-spicy:
  Fix `--with-spicy`.
This commit is contained in:
Robin Sommer 2025-04-11 12:59:29 +02:00
commit 6bf6e695b5
No known key found for this signature in database
GPG key ID: D8187293B3FFE5D0
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,9 @@ 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})
if (SPICY_ROOT_DIR)
target_link_libraries(spicyz PRIVATE hilti spicy)
else ()
if (BINARY_PACKAGING_MODE) if (BINARY_PACKAGING_MODE)
# Ensure we link against the HILTI/Spicy toolchain libraries (should be # Ensure we link against the HILTI/Spicy toolchain libraries (should be
# default, but isn't set here for some reason). # default, but isn't set here for some reason).
@ -21,6 +24,7 @@ else ()
hilti_link_libraries_in_tree(spicyz PRIVATE) hilti_link_libraries_in_tree(spicyz PRIVATE)
spicy_link_libraries_in_tree(spicyz PRIVATE) spicy_link_libraries_in_tree(spicyz PRIVATE)
endif () endif ()
endif ()
prefer_configured_spicy_include_dirs(spicyz) prefer_configured_spicy_include_dirs(spicyz)

2
src/spicy/spicyz/driver.cc
View file

@ -13,13 +13,13 @@
#include <hilti/ast/declarations/type.h> #include <hilti/ast/declarations/type.h>
#include <hilti/compiler/init.h> #include <hilti/compiler/init.h>
#include <hilti/compiler/plugin.h>
#include <spicy/ast/types/unit.h> #include <spicy/ast/types/unit.h>
#include <spicy/ast/visitor.h> #include <spicy/ast/visitor.h>
#include <spicy/autogen/config.h> #include <spicy/autogen/config.h>
#include <spicy/compiler/init.h> #include <spicy/compiler/init.h>
#include "compiler/plugin.h"
#include "config.h" #include "config.h"
#include "glue-compiler.h" #include "glue-compiler.h"