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 branch 'topic/christian/zeek-lib-fix'

Browse source 
* topic/christian/zeek-lib-fix:
  Remove vestigial Conan bit in CMakeLists.txt
  When configuring Spicy, be prepated for zeek_lib or zeek_exe targets.
  Fix a typo in CMakeLists.txt when building Zeek as a library
This commit is contained in:
Christian Kreibich 2024-03-28 11:09:48 -07:00
commit a928bd98a2
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,3 +1,11 @@
7.0.0-dev.98 | 2024-03-28 11:09:48 -0700
* Remove vestigial Conan bit in CMakeLists.txt (Christian Kreibich, Corelight)
* When configuring Spicy, be prepated for zeek_lib or zeek_exe targets. (Christian Kreibich, Corelight)
* Fix a typo in CMakeLists.txt when building Zeek as a library (Christian Kreibich, Corelight)
7.0.0-dev.94 | 2024-03-25 11:25:47 +0100 7.0.0-dev.94 | 2024-03-25 11:25:47 +0100
* Bump Spicy to current `main`. (Robin Sommer, Corelight) * Bump Spicy to current `main`. (Robin Sommer, Corelight)

16
CMakeLists.txt
View file

@ -230,10 +230,6 @@ if (ZEEK_STANDALONE)
endif () endif ()
# Tell zeek_target_link_libraries to add library dependencies as PRIVATE. # Tell zeek_target_link_libraries to add library dependencies as PRIVATE.
set(zeek_exe_access PRIVATE) set(zeek_exe_access PRIVATE)
# Also build the static library when asked for via Conan.
if (CONAN_EXPORTED)
add_library(zeek_lib STATIC)
endif ()
else () else ()
add_library(zeek_lib STATIC) add_library(zeek_lib STATIC)
endif () endif ()
@ -243,7 +239,7 @@ if (TARGET zeek_lib)
add_dependencies(zeek_lib zeek_autogen_files) add_dependencies(zeek_lib zeek_autogen_files)
set_target_properties(zeek_lib PROPERTIES RUNTIME_OUTPUT_NAME libzeek) set_target_properties(zeek_lib PROPERTIES RUNTIME_OUTPUT_NAME libzeek)
if (NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) if (NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
set_target_properties(zeek_lie PROPERTIES LIBRARY_OUTPUT_DIRECTORY src) set_target_properties(zeek_lib PROPERTIES LIBRARY_OUTPUT_DIRECTORY src)
endif () endif ()
install(TARGETS zeek_lib LIBRARY DESTINATION lib) install(TARGETS zeek_lib LIBRARY DESTINATION lib)
# Tell zeek_target_link_libraries to add library dependencies as PRIVATE. # Tell zeek_target_link_libraries to add library dependencies as PRIVATE.
@ -962,8 +958,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)

2
VERSION
View file

@ -1 +1 @@
7.0.0-dev.94 7.0.0-dev.98