Skip to content

Rework external dependency fetching to use opendaq_dependency() #70

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
alexadereyko merged 1 commit into from
Mar 4, 2026
Merged

Rework external dependency fetching to use opendaq_dependency() #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions external/AsamCmpLib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
list(APPEND CMAKE_MESSAGE_CONTEXT AsamCmpLib)

set(OPENDAQ_ALWAYS_FETCH_ASAMCMPLIB ON CACHE BOOL "" FORCE)
set(ASAM_CMP_LIB_BUILD_EXAMPLE OFF)
set(ASAM_CMP_LIB_ENABLE_TESTS OFF)

FetchContent_Declare(
AsamCmpLib
GIT_REPOSITORY https://github.com/openDAQ/ASAM-CMP-Library.git
GIT_TAG v1.0.2-rc
opendaq_dependency(
NAME AsamCmpLib
GIT_REPOSITORY https://github.com/openDAQ/ASAM-CMP-Library.git
GIT_REF v1.0.2-rc
EXPECT_TARGET asam_cmp
)
FetchContent_MakeAvailable(AsamCmpLib)
30 changes: 13 additions & 17 deletions external/PcapPlusPlus/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
list(APPEND CMAKE_MESSAGE_CONTEXT PcapPlusPlus)


if(MSVC)
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/W1>)
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4068>)
endif()

if(WIN32)
FetchContent_Declare(
npcapsdk
URL https://npcap.com/dist/npcap-sdk-1.13.zip
set(OPENDAQ_ALWAYS_FETCH_NPCAPSDK ON CACHE BOOL "" FORCE)
opendaq_dependency(
NAME npcapsdk
URL https://npcap.com/dist/npcap-sdk-1.13.zip
)
FetchContent_MakeAvailable(npcapsdk)
SET(PCAP_ROOT ${npcapsdk_SOURCE_DIR})

set(PCAP_ROOT ${npcapsdk_SOURCE_DIR})
set(PCAP_LINKS_SOLO ON)
Copy link

@NikolaiShipilov NikolaiShipilov Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if this var is related to PcapPlusPlus it should be placed right before

opendaq_dependency(
    NAME                PcapPlusPlus
...

for clarity

endif()


set(_OLD_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(_OLD_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")

Expand All @@ -27,15 +25,13 @@ else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-implicit-fallthrough -Wno-unused-function")
endif()

FetchContent_Declare(
PcapPlusPlus
GIT_REPOSITORY https://github.com/seladb/PcapPlusPlus.git
GIT_TAG v25.05
set(OPENDAQ_ALWAYS_FETCH_PCAPPLUSPLUS ON CACHE BOOL "" FORCE)
opendaq_dependency(
NAME PcapPlusPlus
GIT_REPOSITORY https://github.com/seladb/PcapPlusPlus.git
GIT_REF v25.05
EXPECT_TARGET Pcap++
)
if(WIN32)
set(PCAP_LINKS_SOLO ON)
endif()
FetchContent_MakeAvailable(PcapPlusPlus)

set(CMAKE_CXX_FLAGS "${_OLD_CMAKE_CXX_FLAGS}")
set(CMAKE_C_FLAGS "${_OLD_CMAKE_C_FLAGS}")