mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
Merge branch 'topic/bbannier/bump-spicy'
This commit is contained in:
commit
897b1546a2
3 changed files with 3 additions and 2 deletions
|
@ -1008,6 +1008,7 @@ if (NOT DISABLE_SPICY)
|
||||||
set(Python3_EXECUTABLE ${Python_EXECUTABLE} CACHE STRING "Python3_EXECUTABLE hint")
|
set(Python3_EXECUTABLE ${Python_EXECUTABLE} CACHE STRING "Python3_EXECUTABLE hint")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
set(SPICY_ENABLE_TESTS OFF)
|
||||||
add_subdirectory(auxil/spicy)
|
add_subdirectory(auxil/spicy)
|
||||||
include(ConfigureSpicyBuild) # set some options different for building Spicy
|
include(ConfigureSpicyBuild) # set some options different for building Spicy
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit abd484926df173d8351bc1269a5ac0ad848b3d6e
|
Subproject commit 4fe22b915e5f1ac26c08412fed2bfc2dbc36bfb3
|
2
cmake
2
cmake
|
@ -1 +1 @@
|
||||||
Subproject commit d605f50aee4834ddbceac41c940ed83f1a253f63
|
Subproject commit 26f313a644e4430b0f2bd8dfbb1c992757ed84ae
|
Loading…
Add table
Add a link
Reference in a new issue