From f787be48acdc0f10d750c68ad545153ef0eca9ee Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 9 May 2023 09:06:53 -0700 Subject: [PATCH 1/3] Update cmake submodule [nomail] --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index b191c36167..4e41cdd77f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit b191c36167bc0d6bd9f059b01ad4c99be98488d9 +Subproject commit 4e41cdd77f0aa617c23f37b4776a1ba5c4ea4ea3 From 0203e7cd58877a3f52b435521606b810d014dc4c Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 9 May 2023 09:51:24 -0700 Subject: [PATCH 2/3] bison_target argument changes from HEADER to DEFINES_FILE --- src/CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37527f55dd..627bb17c57 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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,9 +61,9 @@ 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 - # VERBOSE ${CMAKE_CURRENT_BINARY_DIR}/re_parse.output + 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 re_ RE_) @@ -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 From 1cea0f8e6ab9782230d75f86be402c292b455c3d Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 31 May 2023 13:16:03 -0700 Subject: [PATCH 3/3] Update bifcl, binpac, and broker repos for cmake changes --- auxil/bifcl | 2 +- auxil/binpac | 2 +- auxil/broker | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/auxil/bifcl b/auxil/bifcl index 52e1f5a61f..183a0c7fb0 160000 --- a/auxil/bifcl +++ b/auxil/bifcl @@ -1 +1 @@ -Subproject commit 52e1f5a61f52a3a40470216d6b16913af6120334 +Subproject commit 183a0c7fb0e04b843e4a2bafbee44117001228e6 diff --git a/auxil/binpac b/auxil/binpac index 06d7ced8a1..fad1f73222 160000 --- a/auxil/binpac +++ b/auxil/binpac @@ -1 +1 @@ -Subproject commit 06d7ced8a18bdf26b545f0b90d54aeb2f7d87913 +Subproject commit fad1f7322209d93cfa67be3420aecb441a90468b diff --git a/auxil/broker b/auxil/broker index 7ba6e7c265..3df48de38e 160000 --- a/auxil/broker +++ b/auxil/broker @@ -1 +1 @@ -Subproject commit 7ba6e7c265abf9f8a4b33e7063f9d47cba5c1afa +Subproject commit 3df48de38ef75a5d274c2fa59ad3f798a62c6bfc