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 remote-tracking branch 'origin/topic/timw/remove-vendored-cmake-files'

Browse source 
* origin/topic/timw/remove-vendored-cmake-files:
  Update bifcl, binpac, and broker repos for cmake changes
  bison_target argument changes from HEADER to DEFINES_FILE
  Update cmake submodule [nomail]
This commit is contained in:
Tim Wojtulewicz 2023-05-31 13:48:49 -07:00
commit fba058f7b7
7 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGES
View file

@ -1,3 +1,13 @@
6.1.0-dev.4 | 2023-05-31 13:48:49 -0700
* Update bifcl, binpac, and broker repos for cmake changes (Tim Wojtulewicz)
* bison_target argument changes from HEADER to DEFINES_FILE (Tim Wojtulewicz, Corelight)
* Update cmake submodule [nomail] (Tim Wojtulewicz, Corelight)
* Start of 6.1.0 development (Tim Wojtulewicz, Corelight)
6.0.0-dev.683 | 2023-05-31 09:50:46 +0200
* Simplify code generated for Spicy analyzer port ranges. (Benjamin Bannier, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.1.0-dev
6.1.0-dev.4

2
auxil/bifcl

@ -1 +1 @@
Subproject commit 52e1f5a61f52a3a40470216d6b16913af6120334
Subproject commit 183a0c7fb0e04b843e4a2bafbee44117001228e6

2
auxil/binpac

@ -1 +1 @@
Subproject commit 06d7ced8a18bdf26b545f0b90d54aeb2f7d87913
Subproject commit fad1f7322209d93cfa67be3420aecb441a90468b

2
auxil/broker

@ -1 +1 @@
Subproject commit 7ba6e7c265abf9f8a4b33e7063f9d47cba5c1afa
Subproject commit 3df48de38ef75a5d274c2fa59ad3f798a62c6bfc

2
cmake

@ -1 +1 @@
Subproject commit b191c36167bc0d6bd9f059b01ad4c99be98488d9
Subproject commit 4e41cdd77f0aa617c23f37b4776a1ba5c4ea4ea3

11
src/CMakeLists.txt
View file

@ -47,8 +47,8 @@ endif ()
# Rule parser/scanner
bison_target(
RuleParser rule-parse.y ${CMAKE_CURRENT_BINARY_DIR}/rup.cc HEADER
${CMAKE_CURRENT_BINARY_DIR}/rup.h
RuleParser rule-parse.y ${CMAKE_CURRENT_BINARY_DIR}/rup.cc
DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/rup.h
# VERBOSE ${CMAKE_CURRENT_BINARY_DIR}/rule_parse.output
COMPILE_FLAGS "${BISON_FLAGS}")
replace_yy_prefix_target(${CMAKE_CURRENT_BINARY_DIR}/rup.cc
@ -61,8 +61,8 @@ set_property(SOURCE rule-scan.cc APPEND_STRING PROPERTY COMPILE_FLAGS "${SIGN_CO
# RE parser/scanner
bison_target(
REParser re-parse.y ${CMAKE_CURRENT_BINARY_DIR}/rep.cc HEADER
${CMAKE_CURRENT_BINARY_DIR}/re-parse.h
REParser re-parse.y ${CMAKE_CURRENT_BINARY_DIR}/rep.cc
DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/re-parse.h
# VERBOSE ${CMAKE_CURRENT_BINARY_DIR}/re_parse.output
COMPILE_FLAGS "${BISON_FLAGS}")
replace_yy_prefix_target(${CMAKE_CURRENT_BINARY_DIR}/rep.cc ${CMAKE_CURRENT_BINARY_DIR}/re-parse.cc
@ -73,7 +73,8 @@ set_property(SOURCE re-scan.cc APPEND_STRING PROPERTY COMPILE_FLAGS "${SIGN_COMP
# Parser/Scanner
bison_target(
Parser parse.y ${CMAKE_CURRENT_BINARY_DIR}/p.cc HEADER ${CMAKE_CURRENT_BINARY_DIR}/zeekparse.h
Parser parse.y ${CMAKE_CURRENT_BINARY_DIR}/p.cc
DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/zeekparse.h
# VERBOSE ${CMAKE_CURRENT_BINARY_DIR}/parse.output
COMPILE_FLAGS "${BISON_FLAGS}")
replace_yy_prefix_target(${CMAKE_CURRENT_BINARY_DIR}/p.cc ${CMAKE_CURRENT_BINARY_DIR}/parse.cc zeek