Merge remote-tracking branch 'origin/topic/bbannier/issue-3153'

* origin/topic/bbannier/issue-3153:
  Prefer Spicy include directories of this build over accidental ones.

CHANGES

@@ -1,3 +1,9 @@
+6.1.0-dev.121 | 2023-06-27 12:18:38 -0700
+
+  * Prefer Spicy include directories of this build over accidental ones. (Benjamin Bannier, Corelight)
+
+    Closes #3153.
+
 6.1.0-dev.118 | 2023-06-27 18:17:40 +0200
 
   * fix http AUTHORIZATION base64 decode failed (progmboy)

VERSION

@@ -1 +1 @@
-6.1.0-dev.118
+6.1.0-dev.121

cmake

@@ -1 +1 @@
-Subproject commit afa62ecbe399c3dac41f6ebcdb622f409569edd6
+Subproject commit 6085fefd5ce8f01426316aae095851a5784f4db6

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)

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}")

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})