Merge remote-tracking branch 'origin/topic/timw/windows-zeromq-support'

* origin/topic/timw/windows-zeromq-support:
  Reword comment about when ZeroMQ is required for the build
  CI: Add label for enabling the Windows build in PRs
  Enable building ZeroMQ support on Windows

.cirrus.yml

@@ -143,6 +143,12 @@ skip_if_pr_not_full_or_zeekctl: &SKIP_IF_PR_NOT_FULL_OR_ZEEKCTL
       ( $CIRRUS_PR_LABELS =~ ".*CI: Skip All.*" )
     )
 
+skip_if_pr_not_full_or_windows: &SKIP_IF_PR_NOT_FULL_OR_WINDOWS
+  skip: >
+    ( ( $CIRRUS_PR != '' && $CIRRUS_PR_LABELS !=~ ".*CI: (Full|Windows).*" ) ||
+      ( $CIRRUS_PR_LABELS =~ ".*CI: Skip All.*" )
+    )
+
 ci_template: &CI_TEMPLATE
   # Default timeout is 60 minutes, Cirrus hard limit is 120 minutes for free
   # tasks, so may as well ask for full time.
@@ -633,7 +639,7 @@ windows_task:
   build_script: ci/windows/build.cmd
   test_script: ci/windows/test.cmd
   << : *ONLY_IF_PR_MASTER_RELEASE
-  << : *SKIP_IF_PR_NOT_FULL_CI
+  << : *SKIP_IF_PR_NOT_FULL_OR_WINDOWS
   env:
     ZEEK_CI_CPUS: 8
     # Give verbose error output on a test failure.

CHANGES

@@ -1,3 +1,11 @@
+8.1.0-dev.552 | 2025-09-16 13:31:39 -0700
+
+  * Reword comment about when ZeroMQ is required for the build (Tim Wojtulewicz, Corelight)
+
+  * CI: Add label for enabling the Windows build in PRs (Tim Wojtulewicz)
+
+  * Enable building ZeroMQ support on Windows (Tim Wojtulewicz)
+
 8.1.0-dev.548 | 2025-09-16 12:41:52 -0700
 
   * Force SQLite to be in thread-safe mode during CMake (Tim Wojtulewicz, Corelight)

VERSION

@@ -1 +1 @@
-8.1.0-dev.548
+8.1.0-dev.552

ci/windows/build.cmd

@@ -7,5 +7,5 @@ call "c:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliar
 mkdir build
 cd build
 
-cmake.exe .. -DCMAKE_BUILD_TYPE=release -DVCPKG_TARGET_TRIPLET="x64-windows-static" -DENABLE_ZEEK_UNIT_TESTS=yes -DENABLE_CLUSTER_BACKEND_ZEROMQ=no -G Ninja
+cmake.exe .. -DCMAKE_BUILD_TYPE=release -DVCPKG_TARGET_TRIPLET="x64-windows-static" -DENABLE_ZEEK_UNIT_TESTS=yes -G Ninja
 cmake.exe --build .

src/cluster/backend/CMakeLists.txt

@@ -1,14 +1,16 @@
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/zeromq/cmake")
-
-find_package(ZeroMQ)
-
-# Default to building ZeroMQ only if ZeroMQ was found.
-#
-# If a user enabled the cluster backend explicitly (-D ENABLE_CLUSTER_BACKEND_ZEROMQ:bool=ON),
-# but ZeroMQ wasn' found, hard bail.
+# Default to building ZeroMQ, but add an option that allows it to be disabled
+# via CMake.
 option(ENABLE_CLUSTER_BACKEND_ZEROMQ "Enable the ZeroMQ cluster backend" ON)
 
 if (ENABLE_CLUSTER_BACKEND_ZEROMQ)
+
+    if (MSVC)
+        find_package(ZeroMQ CONFIG REQUIRED)
+    else ()
+        list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/zeromq/cmake")
+        find_package(ZeroMQ REQUIRED)
+    endif ()
+
     if (NOT ZeroMQ_FOUND)
         message(FATAL_ERROR "ENABLE_CLUSTER_BACKEND_ZEROMQ set, but ZeroMQ library not available")
     endif ()

src/cluster/backend/zeromq/CMakeLists.txt

@@ -1,6 +1,8 @@
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-find_package(ZeroMQ REQUIRED)
+# On MSVC, ZeroMQ_LIBRARIES may not be set by find_package() earlier in the
+# process. If it isn't, set it to the static target generated by vcpkg.
+if (MSVC AND NOT ZeroMQ_LIBRARIES)
+    set(ZeroMQ_LIBRARIES libzmq-static)
+endif ()
 
 zeek_add_plugin(
     Zeek Cluster_Backend_ZeroMQ

vcpkg.json

@@ -3,7 +3,9 @@
   "version-string": "latest",
   "dependencies": [
     "c-ares",
+    "cppzmq",
     "libpcap",
+    "zeromq",
     "zlib"
   ]
 }