From dbf3267c08fa132cc1ade5aaa0b267688dd54769 Mon Sep 17 00:00:00 2001 From: Doekin <105162544+Doekin@users.noreply.github.com> Date: Sat, 28 Sep 2024 19:47:03 +0800 Subject: [PATCH] pcapplusplus: add linux support and fix linkorders (#5367) * pcapplusplus: add linux support and fix linkorders * use add_links() to simplify setting linkorder * Update xmake.lua * redundant white space --------- Co-authored-by: star9029 Co-authored-by: c8ef --- packages/p/pcapplusplus/xmake.lua | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/p/pcapplusplus/xmake.lua b/packages/p/pcapplusplus/xmake.lua index 56554e209..310acfaa2 100644 --- a/packages/p/pcapplusplus/xmake.lua +++ b/packages/p/pcapplusplus/xmake.lua @@ -1,6 +1,7 @@ package("pcapplusplus") set_homepage("https://github.com/seladb/PcapPlusPlus") set_description("PcapPlusPlus is a multiplatform C++ library for capturing, parsing and crafting of network packets.") + set_license("Unlicense") set_urls("https://github.com/seladb/PcapPlusPlus/archive/refs/tags/$(version).zip", "https://github.com/seladb/PcapPlusPlus.git") @@ -10,16 +11,24 @@ package("pcapplusplus") add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) - add_deps("cmake") + add_links("Pcap++", "Packet++", "Common++") + if is_plat("windows") then add_syslinks("ws2_32") + end + + add_deps("cmake") + if is_plat("windows") then add_deps("npcap_sdk") + elseif is_plat("linux") then + add_deps("libpcap") end - on_install("windows", function (package) - local configs = {} - table.insert(configs, "-DPCAPPP_BUILD_EXAMPLES=OFF") - table.insert(configs, "-DPCAPPP_BUILD_TESTS=OFF") + on_install("windows", "linux", function (package) + local configs = { + "-DPCAPPP_BUILD_EXAMPLES=OFF", + "-DPCAPPP_BUILD_TESTS=OFF", + } table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) import("package.tools.cmake").install(package, configs) end)