Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

When configuring Spicy, be prepated for zeek_lib or zeek_exe targets.

Browse source 
This avoids a configuration error where zeek_exe is not defined (i.e. when
building (only) as a library). It anticipates building both the executable and
the library, which we used to do when using Conan but currently don't.
This commit is contained in:
Christian Kreibich 2024-03-27 16:21:55 -07:00
parent e1ba20a878
commit 602b1f88fb
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -962,8 +962,14 @@ if (NOT DISABLE_SPICY)
hilti_link_object_libraries_in_tree(zeek_exe PRIVATE) hilti_link_object_libraries_in_tree(zeek_exe PRIVATE)
spicy_link_object_libraries_in_tree(zeek_exe PRIVATE) spicy_link_object_libraries_in_tree(zeek_exe PRIVATE)
else () else ()
hilti_link_libraries_in_tree(zeek_exe PRIVATE) if (TARGET zeek_exe)
spicy_link_libraries_in_tree(zeek_exe PRIVATE) hilti_link_libraries_in_tree(zeek_exe PRIVATE)
spicy_link_libraries_in_tree(zeek_exe PRIVATE)
endif ()
if (TARGET zeek_lib)
hilti_link_libraries_in_tree(zeek_lib PRIVATE)
spicy_link_libraries_in_tree(zeek_lib PRIVATE)
endif ()
endif () endif ()
set(HAVE_SPICY yes) set(HAVE_SPICY yes)