aboutsummaryrefslogtreecommitdiff
path: root/ports/winpcap
diff options
context:
space:
mode:
authorSilvio Traversaro <silvio.traversaro@iit.it>2020-06-12 08:13:23 +0200
committerGitHub <noreply@github.com>2020-06-11 23:13:23 -0700
commit310f4df34f154e1e2cd0502a717baf6ccbe29549 (patch)
treedbbf01f44946a684801b1a460e91d7a0a6b66ebe /ports/winpcap
parent50deb3eceb64f387249a6513b51190137dfd7352 (diff)
downloadvcpkg-310f4df34f154e1e2cd0502a717baf6ccbe29549.tar.gz
vcpkg-310f4df34f154e1e2cd0502a717baf6ccbe29549.zip
[libpcap] Enable compilation of libpcap port on x86-windows and x64-windows (#10731)
* Enable compilation of libpcap port on x86-windows and x64-windows As winpcap and libpcap install the same headers, this two port have been marked as not not compatible, and cannot be installed together. * Update ci.baseline.txt * Add libcrafter failing ports to ci.baseline.txt
Diffstat (limited to 'ports/winpcap')
-rw-r--r--ports/winpcap/CONTROL2
-rw-r--r--ports/winpcap/portfile.cmake4
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/winpcap/CONTROL b/ports/winpcap/CONTROL
index ddddcab1c..14960d89d 100644
--- a/ports/winpcap/CONTROL
+++ b/ports/winpcap/CONTROL
@@ -1,4 +1,4 @@
Source: winpcap
-Version: 4.1.3-2
+Version: 4.1.3-3
Homepage: https://www.winpcap.org
Description: WinPcap is the industry-standard tool for link-layer network access in Windows environments.
diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake
index 964122d17..62183624f 100644
--- a/ports/winpcap/portfile.cmake
+++ b/ports/winpcap/portfile.cmake
@@ -1,4 +1,6 @@
-include(vcpkg_common_functions)
+if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libpcap")
+ message(FATAL_ERROR "FATAL ERROR: libpcap and winpcap are incompatible.")
+endif()
set(WINPCAP_VERSION 4_1_3)