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

Merge remote-tracking branch 'origin/topic/neverlord/gh-3019'

Browse source 
* origin/topic/neverlord/gh-3019:
  Skip version.h by default for Zeek sources
This commit is contained in:
Arne Welzel 2023-05-05 20:14:21 +02:00
commit ab4f231232
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
6.0.0-dev.510 | 2023-05-05 20:14:21 +0200
* Skip version.h by default for Zeek sources (Dominik Charousset, Corelight)
6.0.0-dev.508 | 2023-05-05 08:48:10 -0700 6.0.0-dev.508 | 2023-05-05 08:48:10 -0700
* generate-docs: Only update submodule pointer during scheduled builds (Tim Wojtulewicz, Corelight) * generate-docs: Only update submodule pointer during scheduled builds (Tim Wojtulewicz, Corelight)

5
CMakeLists.txt
View file

@ -192,6 +192,11 @@ set_target_properties(zeek_internal PROPERTIES EXPORT_NAME Internal)
install(TARGETS zeek_internal EXPORT ZeekTargets) install(TARGETS zeek_internal EXPORT ZeekTargets)
target_compile_features(zeek_internal INTERFACE ${ZEEK_CXX_STD}) target_compile_features(zeek_internal INTERFACE ${ZEEK_CXX_STD})
# Skip including the version.h header from the zeek-config.h header. This is
# mainly to optimize build times on CI by making sure the compiler cache remains
# valid for longer.
target_compile_definitions(zeek_internal INTERFACE ZEEK_CONFIG_SKIP_VERSION_H)
# Target for bundling the creation of auto-generated files. # Target for bundling the creation of auto-generated files.
add_custom_target(zeek_autogen_files) add_custom_target(zeek_autogen_files)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.508 6.0.0-dev.510