From 3c535ec215e52732ed2b839a39366f693143137b Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 6 Aug 2025 12:10:41 -0700 Subject: [PATCH 1/2] cmake_minimum_required() should come before project() --- .../binpac-flowbuffer-frame-length-plugin/CMakeLists.txt | 4 ++-- testing/btest/plugins/conflict-plugin/CMakeLists.txt | 4 ++-- testing/btest/plugins/connkey-plugin/CMakeLists.txt | 4 ++-- testing/btest/plugins/file-plugin/CMakeLists.txt | 4 ++-- testing/btest/plugins/packet-protocol-plugin/CMakeLists.txt | 4 ++-- testing/btest/plugins/pktdumper-plugin/CMakeLists.txt | 4 ++-- testing/btest/plugins/pktsrc-plugin/CMakeLists.txt | 4 ++-- testing/btest/plugins/protocol-plugin/CMakeLists.txt | 4 ++-- testing/btest/plugins/reader-plugin/CMakeLists.txt | 4 ++-- testing/btest/plugins/writer-plugin/CMakeLists.txt | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/CMakeLists.txt b/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/CMakeLists.txt index 0175e1da6d..60d6eef056 100644 --- a/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/CMakeLists.txt +++ b/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ -project(Zeek-Plugin-Foo-FOO) - cmake_minimum_required(VERSION 3.15) +project(Zeek-Plugin-Foo-FOO) + if (NOT ZEEK_DIST) message(FATAL_ERROR "ZEEK_DIST not set") endif () diff --git a/testing/btest/plugins/conflict-plugin/CMakeLists.txt b/testing/btest/plugins/conflict-plugin/CMakeLists.txt index 64c10fac4f..c5edb8b577 100644 --- a/testing/btest/plugins/conflict-plugin/CMakeLists.txt +++ b/testing/btest/plugins/conflict-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ -project(Zeek-Plugin-Conflict-Plugin) - cmake_minimum_required(VERSION 3.15) +project(Zeek-Plugin-Conflict-Plugin) + if (NOT ZEEK_DIST) message(FATAL_ERROR "ZEEK_DIST not set") endif () diff --git a/testing/btest/plugins/connkey-plugin/CMakeLists.txt b/testing/btest/plugins/connkey-plugin/CMakeLists.txt index 5945ecac62..a669061826 100644 --- a/testing/btest/plugins/connkey-plugin/CMakeLists.txt +++ b/testing/btest/plugins/connkey-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ -project(Zeek-Plugin-Demo-Foo) - cmake_minimum_required(VERSION 3.15) +project(Zeek-Plugin-Demo-Foo) + if (NOT ZEEK_DIST) message(FATAL_ERROR "ZEEK_DIST not set") endif () diff --git a/testing/btest/plugins/file-plugin/CMakeLists.txt b/testing/btest/plugins/file-plugin/CMakeLists.txt index e57542dd9b..b96fcc9b52 100644 --- a/testing/btest/plugins/file-plugin/CMakeLists.txt +++ b/testing/btest/plugins/file-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ -project(Zeek-Plugin-Demo-Foo) - cmake_minimum_required(VERSION 3.15) +project(Zeek-Plugin-Demo-Foo) + if (NOT BRO_DIST) message(FATAL_ERROR "BRO_DIST not set") endif () diff --git a/testing/btest/plugins/packet-protocol-plugin/CMakeLists.txt b/testing/btest/plugins/packet-protocol-plugin/CMakeLists.txt index d245a214ad..8169744779 100644 --- a/testing/btest/plugins/packet-protocol-plugin/CMakeLists.txt +++ b/testing/btest/plugins/packet-protocol-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ -project(Zeek-Packet-Plugin-Demo) - cmake_minimum_required(VERSION 3.15) +project(Zeek-Packet-Plugin-Demo) + if (NOT ZEEK_DIST) message(FATAL_ERROR "ZEEK_DIST not set") endif () diff --git a/testing/btest/plugins/pktdumper-plugin/CMakeLists.txt b/testing/btest/plugins/pktdumper-plugin/CMakeLists.txt index 9b59801cae..1c5152fab7 100644 --- a/testing/btest/plugins/pktdumper-plugin/CMakeLists.txt +++ b/testing/btest/plugins/pktdumper-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ -project(Zeek-Plugin-Demo-Foo) - cmake_minimum_required(VERSION 3.15) +project(Zeek-Plugin-Demo-Foo) + if (NOT ZEEK_DIST) message(FATAL_ERROR "ZEEK_DIST not set") endif () diff --git a/testing/btest/plugins/pktsrc-plugin/CMakeLists.txt b/testing/btest/plugins/pktsrc-plugin/CMakeLists.txt index 9b59801cae..1c5152fab7 100644 --- a/testing/btest/plugins/pktsrc-plugin/CMakeLists.txt +++ b/testing/btest/plugins/pktsrc-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ -project(Zeek-Plugin-Demo-Foo) - cmake_minimum_required(VERSION 3.15) +project(Zeek-Plugin-Demo-Foo) + if (NOT ZEEK_DIST) message(FATAL_ERROR "ZEEK_DIST not set") endif () diff --git a/testing/btest/plugins/protocol-plugin/CMakeLists.txt b/testing/btest/plugins/protocol-plugin/CMakeLists.txt index da3e5c3940..8f05bca204 100644 --- a/testing/btest/plugins/protocol-plugin/CMakeLists.txt +++ b/testing/btest/plugins/protocol-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ -project(Zeek-Plugin-Demo-Foo) - cmake_minimum_required(VERSION 3.15) +project(Zeek-Plugin-Demo-Foo) + if (NOT ZEEK_DIST) message(FATAL_ERROR "ZEEK_DIST not set") endif () diff --git a/testing/btest/plugins/reader-plugin/CMakeLists.txt b/testing/btest/plugins/reader-plugin/CMakeLists.txt index 9b59801cae..1c5152fab7 100644 --- a/testing/btest/plugins/reader-plugin/CMakeLists.txt +++ b/testing/btest/plugins/reader-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ -project(Zeek-Plugin-Demo-Foo) - cmake_minimum_required(VERSION 3.15) +project(Zeek-Plugin-Demo-Foo) + if (NOT ZEEK_DIST) message(FATAL_ERROR "ZEEK_DIST not set") endif () diff --git a/testing/btest/plugins/writer-plugin/CMakeLists.txt b/testing/btest/plugins/writer-plugin/CMakeLists.txt index 9b59801cae..1c5152fab7 100644 --- a/testing/btest/plugins/writer-plugin/CMakeLists.txt +++ b/testing/btest/plugins/writer-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ -project(Zeek-Plugin-Demo-Foo) - cmake_minimum_required(VERSION 3.15) +project(Zeek-Plugin-Demo-Foo) + if (NOT ZEEK_DIST) message(FATAL_ERROR "ZEEK_DIST not set") endif () From 162ecc022ee46e6d68d95bda0f07bae92e75d52b Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 6 Aug 2025 12:12:19 -0700 Subject: [PATCH 2/2] Update zeek-aux to remove BRO_DIST from plugin skeleton --- auxil/zeek-aux | 2 +- testing/btest/plugins/file-plugin/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/auxil/zeek-aux b/auxil/zeek-aux index 6c72725b18..9a51ce1940 160000 --- a/auxil/zeek-aux +++ b/auxil/zeek-aux @@ -1 +1 @@ -Subproject commit 6c72725b184cc5fd7d12cea5084f0f51de3e82e3 +Subproject commit 9a51ce1940a808aaad253077905c2b34f15f1e08 diff --git a/testing/btest/plugins/file-plugin/CMakeLists.txt b/testing/btest/plugins/file-plugin/CMakeLists.txt index b96fcc9b52..1ab4567b89 100644 --- a/testing/btest/plugins/file-plugin/CMakeLists.txt +++ b/testing/btest/plugins/file-plugin/CMakeLists.txt @@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.15) project(Zeek-Plugin-Demo-Foo) -if (NOT BRO_DIST) - message(FATAL_ERROR "BRO_DIST not set") +if (NOT ZEEK_DIST) + message(FATAL_ERROR "ZEEK_DIST not set") endif () -set(CMAKE_MODULE_PATH ${BRO_DIST}/cmake) +set(CMAKE_MODULE_PATH ${ZEEK_DIST}/cmake) include(ZeekPlugin)