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

Merge remote-tracking branch 'origin/topic/timw/fix-pcap-override'

Browse source 
* origin/topic/timw/fix-pcap-override:
  Make sure that vcpkg isn't preferred if pcap_root_dir is passed in
This commit is contained in:
Tim Wojtulewicz 2024-04-11 15:26:05 -07:00
commit 6c88bd115c
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
7.0.0-dev.116 | 2024-04-11 15:26:05 -0700
* Make sure that vcpkg isn't preferred if pcap_root_dir is passed in (Tim Wojtulewicz)
7.0.0-dev.114 | 2024-04-10 11:02:32 +0200 7.0.0-dev.114 | 2024-04-10 11:02:32 +0200
* Bump Spicy, including necessary changes to work with the current * Bump Spicy, including necessary changes to work with the current

5
CMakeLists.txt
View file

@ -133,7 +133,10 @@ if (MSVC)
# Set PCAP_ROOT_DIR to point at the installation from vcpkg. A later call # Set PCAP_ROOT_DIR to point at the installation from vcpkg. A later call
# to FindPCAP.cmake will fill in the rest of the necessary variables. # to FindPCAP.cmake will fill in the rest of the necessary variables.
if (NOT PCAP_ROOT_DIR) if (NOT PCAP_ROOT_DIR)
set(PCAP_ROOT_DIR ${VCPKG_INSTALLED_DIR}/x64-windows-static) set(PCAP_ROOT_DIR ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
else ()
unset(PCAP_INCLUDE_DIR CACHE)
unset(PCAP_LIBRARY CACHE)
endif () endif ()
set(LIBPCAP_PCAP_COMPILE_NOPCAP_HAS_ERROR_PARAMETER false) set(LIBPCAP_PCAP_COMPILE_NOPCAP_HAS_ERROR_PARAMETER false)

2
VERSION
View file

@ -1 +1 @@
7.0.0-dev.114 7.0.0-dev.116

2
cmake

@ -1 +1 @@
Subproject commit 50e3d75cc2fd06e5d274244aba0d40db7d9a960b Subproject commit 1d793368ac4d4b06cb2c9c716e5477dbf3c2a8e3

2
doc

@ -1 +1 @@
Subproject commit 859234548b54dc271f42355206080ab838d00ed3 Subproject commit 126bdb2250266064135e9aa5ab9b45ab390c4651