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

* origin/topic/timw/fix-pcap-override: Make sure that vcpkg isn't preferred if pcap_root_dir is passed in
zeek · Apr 11, 2024 · 6c88bd1 · 6c88bd1
2 parents da74573 + eedd0fb
commit 6c88bd1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -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
 
   * Bump Spicy, including necessary changes to work with the current

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -133,7 +133,10 @@ if (MSVC)
     # 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.
     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 ()
 
     set(LIBPCAP_PCAP_COMPILE_NOPCAP_HAS_ERROR_PARAMETER false)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.0.0-dev.114
+7.0.0-dev.116
diff --git a/cmake b/cmake
diff --git a/doc b/doc