Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Switch all of the conan configuration to vcpkg

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-01-18 18:02:29 -07:00
parent 9da9d0d7a8
commit 674816a01d
8 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ci/windows/Dockerfile
View file

@ -16,8 +16,6 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePoin
# Install prerequisites
RUN choco install -y --no-progress visualstudio2019buildtools --version=16.11.11.0
RUN choco install -y --no-progress visualstudio2019-workload-vctools --version=1.0.0 --package-parameters '--add Microsoft.VisualStudio.Component.VC.ATLMFC'
# Pin conan to 1.58.0 until conan.cmake is updated to support 2.0
RUN choco install -y --no-progress conan --version=1.58.0
RUN choco install -y --no-progress sed
RUN choco install -y --no-progress winflexbison3
RUN choco install -y --no-progress msysgit

2
ci/windows/build.cmd
View file

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

8
ci/windows/conanfile_windows.txt
View file

@ -1,8 +0,0 @@
[requires]
zlib/1.2.11
libpcap/1.10.1
c-ares/1.21.0
[generators]
cmake_find_package
cmake