diff --git a/CHANGES b/CHANGES index 433920c96e..f5f61794bd 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Bump Spicy to current `main`. (Robin Sommer, Corelight) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7d7a23816..891858ac4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,10 +230,6 @@ if (ZEEK_STANDALONE) endif () # Tell zeek_target_link_libraries to add library dependencies as 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 () add_library(zeek_lib STATIC) endif () @@ -243,7 +239,7 @@ if (TARGET zeek_lib) add_dependencies(zeek_lib zeek_autogen_files) set_target_properties(zeek_lib PROPERTIES RUNTIME_OUTPUT_NAME libzeek) 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 () install(TARGETS zeek_lib LIBRARY DESTINATION lib) # 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) spicy_link_object_libraries_in_tree(zeek_exe PRIVATE) else () - hilti_link_libraries_in_tree(zeek_exe PRIVATE) - spicy_link_libraries_in_tree(zeek_exe PRIVATE) + if (TARGET zeek_exe) + 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 () set(HAVE_SPICY yes) diff --git a/VERSION b/VERSION index cecc13c130..ab82c66dbc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0-dev.94 +7.0.0-dev.98