Skip to content

Updated udpcap to 2.0.2 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2025
Merged

Updated udpcap to 2.0.2 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ec1c6e
Updated udpcap to 2.0.2
FlorianReimold May 14, 2025
d1df9f1
Merge branch 'main' of https://github.com/eclipse-ecal/ecaludp into f…
FlorianReimold May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:

- name: Set Variables
run: |
# dependencies are always supposed to be built shared, so we set the BUILD_SHARED_LIBS to OFF
echo "build_shared_libs=OFF" >> "$GITHUB_ENV"

if [[ '${{ matrix.library_type }}' == 'static' ]]; then
echo "build_shared_libs=OFF" >> "$GITHUB_ENV"
echo "ecaludp_library_type=STATIC" >> "$GITHUB_ENV"
echo "package_postfix=static" >> "$GITHUB_ENV"
elif [[ '${{ matrix.library_type }}' == 'shared' ]]; then
echo "build_shared_libs=ON" >> "$GITHUB_ENV"
echo "ecaludp_library_type=SHARED" >> "$GITHUB_ENV"
echo "package_postfix=shared" >> "$GITHUB_ENV"
elif [[ '${{ matrix.library_type }}' == 'object' ]]; then
echo "build_shared_libs=OFF" >> "$GITHUB_ENV"
echo "ecaludp_library_type=OBJECT" >> "$GITHUB_ENV"
echo "package_postfix=object" >> "$GITHUB_ENV"
fi
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/build-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
INSTALL_PREFIX: _install
PROJECT_NAME: ecaludp
VS_TOOLSET: v141
VS_NAME: vs2017
VS_TOOLSET: v142
VS_NAME: vs2019

jobs:
build-windows:
Expand All @@ -31,6 +31,9 @@ jobs:

- name: Set Variables
run: |
# dependencies are always supposed to be built shared, so we set the BUILD_SHARED_LIBS to OFF
echo "build_shared_libs=OFF" >> "$Env:GITHUB_ENV"

if ( '${{ matrix.library_type }}' -eq 'static' )
{
echo "ecaludp_library_type=STATIC" >> "$Env:GITHUB_ENV"
Expand Down Expand Up @@ -82,6 +85,7 @@ jobs:
-DECALUDP_USE_BUILTIN_GTEST=ON ^
-DECALUDP_LIBRARY_TYPE=${{env.ecaludp_library_type}} ^
-DECALUDP_ENABLE_NPCAP=${{ matrix.npcap_enabled }} ^
-DBUILD_SHARED_LIBS=${{ env.build_shared_libs }} ^
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}}

- name: Build (Release)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/udpcap
Open in desktop
Submodule udpcap updated 17 files
+49 −23 .github/workflows/build-windows.yml
+10 −7 CMakeLists.txt
+1 −1 CMakeWindows.bat
+3 −1 README.md
+2 −2 samples/asio_sender_multicast/src/main.cpp
+2 −2 samples/asio_sender_unicast/src/main.cpp
+1 −2 samples/integration_test/CMakeLists.txt
+36 −36 tests/udpcap_test/src/udpcap_test.cpp
+6 −23 thirdparty/GTest/GTest_make_available.cmake
+8 −10 thirdparty/asio/asio_make_available.cmake
+12 −10 thirdparty/npcap/npcap_make_available.cmake
+1 −109 thirdparty/pcapplusplus/Modules/Findpcapplusplus.cmake
+13 −15 thirdparty/pcapplusplus/pcapplusplus_make_available.cmake
+72 −62 udpcap/CMakeLists.txt
+1 −1 udpcap/cmake/udpcapConfig-static.cmake.in
+69 −8 udpcap/src/udpcap_socket_private.cpp
+1 −1 udpcap/version.cmake