Include build changes from zeek/3576 also

brimdata · Feb 8, 2024 · e5dc36e · e5dc36e
1 parent 5cd3467
commit e5dc36e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,14 +62,13 @@ jobs:
     - name: Build Zeek (Windows)
       if: startsWith(matrix.platform, 'windows-')
       run: |
-        choco install -y --no-progress conan --version=1.58.0
         choco install -y --no-progress winflexbison3
         choco install -y --no-progress ccache
         call refreshenv
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
         mkdir zeek-src\build
         cd zeek-src\build
-        cmake.exe .. -DCMAKE_BUILD_TYPE=release -DENABLE_ZEEK_UNIT_TESTS=yes -D CMAKE_INSTALL_PREFIX="C:\Program Files\Git\usr\local\zeek" -DLibMMDB_INCLUDE_DIR="C:\Program Files (x86)\maxminddb\include" -DLibMMDB_LIBRARY="C:\Program Files (x86)\maxminddb\lib\maxminddb.lib" -G Ninja
+        cmake.exe .. -DCMAKE_BUILD_TYPE=release -DCMAKE_TOOLCHAIN_FILE="auxil/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="x64-windows-static" -DENABLE_ZEEK_UNIT_TESTS=yes -D CMAKE_INSTALL_PREFIX="C:\Program Files\Git\usr\local\zeek" -DLibMMDB_INCLUDE_DIR="C:\Program Files (x86)\maxminddb\include" -DLibMMDB_LIBRARY="C:\Program Files (x86)\maxminddb\lib\maxminddb.lib" -G Ninja
         cmake.exe --build .
         cmake.exe --install .
         cd