From c718f7f632d601922dde1e70ae4766d278bf3e86 Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <benjamin.bannier@corelight.com>
Date: Tue, 27 Jun 2023 14:41:45 +0200
Subject: [PATCH] Prefer Spicy include directories of this build over
 accidental ones.

Closes #3153.
---
 cmake                           | 2 +-
 src/CMakeLists.txt              | 1 +
 src/spicy/CMakeLists.txt        | 1 +
 src/spicy/spicyz/CMakeLists.txt | 3 +++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cmake b/cmake
index afa62ecbe3..06e77e63a2 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit afa62ecbe399c3dac41f6ebcdb622f409569edd6
+Subproject commit 06e77e63a23e267c822e62df5ddbc4c720c93542
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f7fe8931bf..294d74d428 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -520,6 +520,7 @@ zeek_target_link_libraries(zeek_objs)
 
 if (HAVE_SPICY)
     target_link_libraries(zeek_objs PRIVATE hilti spicy)
+    prefer_configured_spicy_include_dirs(zeek_objs)
 endif ()
 
 if (TARGET zeek_exe)
diff --git a/src/spicy/CMakeLists.txt b/src/spicy/CMakeLists.txt
index bd3b6e5c83..8d3d625dd7 100644
--- a/src/spicy/CMakeLists.txt
+++ b/src/spicy/CMakeLists.txt
@@ -17,6 +17,7 @@ zeek_add_subdir_library(
     spicy.bif)
 
 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 "")
 install(DIRECTORY DESTINATION "${ZEEK_SPICY_MODULE_PATH}")
diff --git a/src/spicy/spicyz/CMakeLists.txt b/src/spicy/spicyz/CMakeLists.txt
index f49d8a309f..e8a0b0f9f8 100644
--- a/src/spicy/spicyz/CMakeLists.txt
+++ b/src/spicy/spicyz/CMakeLists.txt
@@ -7,7 +7,10 @@ add_executable(spicyz driver.cc glue-compiler.cc main.cc)
 target_compile_options(spicyz PRIVATE "-Wall")
 target_compile_features(spicyz PRIVATE "${ZEEK_CXX_STD}")
 set_target_properties(spicyz PROPERTIES CXX_EXTENSIONS OFF)
+
 target_include_directories(spicyz PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
 target_link_libraries(spicyz PRIVATE hilti spicy)
+prefer_configured_spicy_include_dirs(spicyz)
 
 install(TARGETS spicyz DESTINATION ${CMAKE_INSTALL_BINDIR})