From 912cc5a0d52b4a3695be1f9a1f9a53eb1613872d Mon Sep 17 00:00:00 2001 From: xfangfang <2553041586@qq.com> Date: Tue, 14 May 2024 00:31:21 +0800 Subject: [PATCH] Using pcap instead of wpcap --- .github/workflows/ci.yaml | 2 +- CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1a0d5ea..2a404cb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,7 +31,7 @@ jobs: - { target: x86_64-macos-none, os: macos-13 , strip: "strip", upx: "ls" } - { target: aarch64-macos-none, os: macos-14 , strip: "strip", upx: "ls" } - { target: x86_64-windows-gnu, os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma", - cmake: "-DPCAP_ROOT=/tmp/sdk", ext: ".exe", name: "(ucrt)" } + cmake: "-DUSE_SYSTEM_PCAP=OFF -DPCAP_ROOT=/tmp/sdk", ext: ".exe", name: "(ucrt)" } - { target: x86_64-linux-musl, os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma", cmake: "-DUSE_SYSTEM_PCAP=OFF" } - { target: aarch64-linux-musl, os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma", diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ae63a9..d5c1290 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,8 @@ else () # Fix zig cross-compiling issue set(CMAKE_USE_PTHREADS_INIT ON) set(PPPWN_PCAP_DIRECTION OFF) - elseif (NOT USE_SYSTEM_PCAP) + endif() + if (NOT USE_SYSTEM_PCAP) include(FetchContent) set(DISABLE_DBUS ON) set(DISABLE_RDMA ON)