Merge branch 'dev' into bump-version-to-26-07

Author: seladb

.github/workflows/build_and_test.yml

@@ -63,17 +63,20 @@ jobs:
           - runner: ubuntu-latest
             image: ubuntu2604
             config-zstd: OFF
+          - runner: ubuntu-26.04-arm
+            image: ubuntu2604-arm64
+            config-zstd: OFF
           - runner: ubuntu-latest
-            image: ubuntu2404
+            image: ubuntu2604-icpx
             config-zstd: OFF
+            additional-flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx
+            additional-gcov-flags: --gcov-executable "llvm-cov gcov"
           - runner: ubuntu-latest
-            image: ubuntu2204
+            image: ubuntu2404
             config-zstd: OFF
           - runner: ubuntu-latest
-            image: ubuntu2204-icpx
+            image: ubuntu2204
             config-zstd: OFF
-            additional-flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx
-            additional-gcov-flags: --gcov-executable "llvm-cov gcov"
           - runner: ubuntu-latest
             image: rhel94
             config-zstd: OFF
@@ -88,9 +91,6 @@ jobs:
           - runner: ubuntu-latest
             image: alpine320
             config-zstd: OFF
-          - runner: ubuntu-24.04-arm
-            image: ubuntu2404-arm64
-            config-zstd: OFF
 
     steps:
       - name: Checkout code

.github/workflows/package.yml

@@ -32,19 +32,19 @@ jobs:
           - runner: ubuntu-latest
             image: ubuntu2604
             config-zstd: OFF
-          - runner: ubuntu-latest
-            image: ubuntu2404
+          - runner: ubuntu-26.04-arm
+            image: ubuntu2604-arm64
             config-zstd: OFF
-          - runner: ubuntu-24.04-arm
-            image: ubuntu2404-arm64
+          - runner: ubuntu-latest
+            image: ubuntu2604-icpx
             config-zstd: OFF
+            additional-flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx
           - runner: ubuntu-latest
-            image: ubuntu2204
+            image: ubuntu2404
             config-zstd: OFF
           - runner: ubuntu-latest
-            image: ubuntu2204-icpx
+            image: ubuntu2204
             config-zstd: OFF
-            additional-flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx
           - runner: ubuntu-latest
             image: rhel94
             config-zstd: OFF

Examples/PcapPlusPlus-benchmark/CMakeLists.txt

@@ -13,7 +13,7 @@ if("cxx_std_14" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
     include(FetchContent)
 
     # Fetch Google Benchmark
-    FetchContent_Declare(benchmark GIT_REPOSITORY https://github.com/google/benchmark.git GIT_TAG v1.9.0)
+    FetchContent_Declare(benchmark GIT_REPOSITORY https://github.com/google/benchmark.git GIT_TAG v1.9.5)
 
     # Disable testing and installation for Google Benchmark
     set(BENCHMARK_ENABLE_TESTING OFF)
@@ -22,6 +22,8 @@ if("cxx_std_14" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
 
     add_executable(BenchmarkExampleGoogle benchmark-google.cpp)
 
+    target_compile_definitions(BenchmarkExampleGoogle PRIVATE NOMINMAX)
+
     target_link_libraries(BenchmarkExampleGoogle PUBLIC PcapPlusPlus::Pcap++ benchmark::benchmark)
 
     set_target_properties(BenchmarkExampleGoogle PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PCAPPP_BINARY_EXAMPLES_DIR}")