Skip to content

Commit 7527e88

Browse files
authored
Rework external dependency fetching to use opendaq_dependency() (#70)
- Replace raw FetchContent_Declare/MakeAvailable with opendaq_dependency() for PcapPlusPlus, npcapsdk, and AsamCmpLib - Set OPENDAQ_ALWAYS_FETCH_* cache variables to preserve current behavior of always fetching dependencies from source
1 parent 8b79e79 commit 7527e88

2 files changed

Lines changed: 19 additions & 24 deletions

File tree

external/AsamCmpLib/CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
list(APPEND CMAKE_MESSAGE_CONTEXT AsamCmpLib)
2-
1+
set(OPENDAQ_ALWAYS_FETCH_ASAMCMPLIB ON CACHE BOOL "" FORCE)
32
set(ASAM_CMP_LIB_BUILD_EXAMPLE OFF)
43
set(ASAM_CMP_LIB_ENABLE_TESTS OFF)
54

6-
FetchContent_Declare(
7-
AsamCmpLib
8-
GIT_REPOSITORY https://github.com/openDAQ/ASAM-CMP-Library.git
9-
GIT_TAG v1.0.2-rc
5+
opendaq_dependency(
6+
NAME AsamCmpLib
7+
GIT_REPOSITORY https://github.com/openDAQ/ASAM-CMP-Library.git
8+
GIT_REF v1.0.2-rc
9+
EXPECT_TARGET asam_cmp
1010
)
11-
FetchContent_MakeAvailable(AsamCmpLib)
Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
list(APPEND CMAKE_MESSAGE_CONTEXT PcapPlusPlus)
2-
3-
41
if(MSVC)
52
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/W1>)
63
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4068>)
74
endif()
85

96
if(WIN32)
10-
FetchContent_Declare(
11-
npcapsdk
12-
URL https://npcap.com/dist/npcap-sdk-1.13.zip
7+
set(OPENDAQ_ALWAYS_FETCH_NPCAPSDK ON CACHE BOOL "" FORCE)
8+
opendaq_dependency(
9+
NAME npcapsdk
10+
URL https://npcap.com/dist/npcap-sdk-1.13.zip
1311
)
14-
FetchContent_MakeAvailable(npcapsdk)
15-
SET(PCAP_ROOT ${npcapsdk_SOURCE_DIR})
12+
13+
set(PCAP_ROOT ${npcapsdk_SOURCE_DIR})
14+
set(PCAP_LINKS_SOLO ON)
1615
endif()
1716

18-
1917
set(_OLD_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
2018
set(_OLD_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
2119

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

30-
FetchContent_Declare(
31-
PcapPlusPlus
32-
GIT_REPOSITORY https://github.com/seladb/PcapPlusPlus.git
33-
GIT_TAG v25.05
28+
set(OPENDAQ_ALWAYS_FETCH_PCAPPLUSPLUS ON CACHE BOOL "" FORCE)
29+
opendaq_dependency(
30+
NAME PcapPlusPlus
31+
GIT_REPOSITORY https://github.com/seladb/PcapPlusPlus.git
32+
GIT_REF v25.05
33+
EXPECT_TARGET Pcap++
3434
)
35-
if(WIN32)
36-
set(PCAP_LINKS_SOLO ON)
37-
endif()
38-
FetchContent_MakeAvailable(PcapPlusPlus)
3935

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

0 commit comments

Comments
 (0)