CMake: Remove telemetry::telemetry link dependency and include headers directly to CMake modules

Pavel Siska · Pavel Siska · commit 4e7d87c5771f · 2025-10-09T15:06:37.000+02:00
diff --git a/src/plugins/input/dpdk/CMakeLists.txt b/src/plugins/input/dpdk/CMakeLists.txt
@@ -26,13 +26,13 @@ target_include_directories(ipfixprobe-input-dpdk PRIVATE
 	${DPDK_INCLUDE_DIRS}
 	${CMAKE_SOURCE_DIR}/include/
 	${CMAKE_SOURCE_DIR}/src/plugins/input/parser
+	${telemetry_SOURCE_DIR}/include
 )
 
 target_compile_options(ipfixprobe-input-dpdk PRIVATE ${DPDK_CFLAGS_OTHER})
 target_compile_options(ipfixprobe-input-dpdk PRIVATE -Wno-volatile -Wno-pedantic)
 
 target_link_libraries(ipfixprobe-input-dpdk PRIVATE
-	telemetry::telemetry
 	${DPDK_LIBRARIES}
 )
 
diff --git a/src/plugins/input/nfb/CMakeLists.txt b/src/plugins/input/nfb/CMakeLists.txt
@@ -18,12 +18,12 @@ set_target_properties(ipfixprobe-input-nfb PROPERTIES
 target_include_directories(ipfixprobe-input-nfb PRIVATE
 	${CMAKE_SOURCE_DIR}/include/
 	${CMAKE_SOURCE_DIR}/src/plugins/input/parser
+	${telemetry_SOURCE_DIR}/include
 )
 
 target_link_libraries(ipfixprobe-input-nfb PRIVATE
 	nfb::nfb
 	numa::numa
-	telemetry::telemetry
 )
 
 install(TARGETS ipfixprobe-input-nfb
diff --git a/src/plugins/input/pcap/CMakeLists.txt b/src/plugins/input/pcap/CMakeLists.txt
@@ -15,6 +15,7 @@ target_include_directories(ipfixprobe-input-pcap PRIVATE
 	${PCAP_INCLUDE_DIRS}
 	${CMAKE_SOURCE_DIR}/include/
 	${CMAKE_SOURCE_DIR}/src/plugins/input/parser
+	${telemetry_SOURCE_DIR}/include
 )
 
 target_compile_definitions(ipfixprobe-input-pcap PRIVATE
@@ -23,7 +24,6 @@ target_compile_definitions(ipfixprobe-input-pcap PRIVATE
 
 target_link_libraries(ipfixprobe-input-pcap PRIVATE
 	${PCAP_LIBRARIES}
-	telemetry::telemetry
 )
 
 install(TARGETS ipfixprobe-input-pcap
diff --git a/src/plugins/input/raw/CMakeLists.txt b/src/plugins/input/raw/CMakeLists.txt
@@ -15,10 +15,7 @@ set_target_properties(ipfixprobe-input-raw PROPERTIES
 target_include_directories(ipfixprobe-input-raw PRIVATE
 	${CMAKE_SOURCE_DIR}/include/
 	${CMAKE_SOURCE_DIR}/src/plugins/input/parser
-)
-
-target_link_libraries(ipfixprobe-input-raw PRIVATE
-	telemetry::telemetry
+	${telemetry_SOURCE_DIR}/include
 )
 
 install(TARGETS ipfixprobe-input-raw
diff --git a/src/plugins/storage/cache/CMakeLists.txt b/src/plugins/storage/cache/CMakeLists.txt
@@ -23,10 +23,7 @@ set_target_properties(ipfixprobe-storage-cache PROPERTIES
 
 target_include_directories(ipfixprobe-storage-cache PRIVATE
 	${CMAKE_SOURCE_DIR}/include/
-)
-
-target_link_libraries(ipfixprobe-storage-cache PRIVATE
-	telemetry::telemetry
+	${telemetry_SOURCE_DIR}/include
 )
 
 install(TARGETS ipfixprobe-storage-cache

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ target_include_directories(ipfixprobe-input-dpdk PRIVATE`
`26`	`26`	`${DPDK_INCLUDE_DIRS}`
`27`	`27`	`${CMAKE_SOURCE_DIR}/include/`
`28`	`28`	`${CMAKE_SOURCE_DIR}/src/plugins/input/parser`
	`29`	`+ ${telemetry_SOURCE_DIR}/include`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	`target_compile_options(ipfixprobe-input-dpdk PRIVATE ${DPDK_CFLAGS_OTHER})`
`32`	`33`	`target_compile_options(ipfixprobe-input-dpdk PRIVATE -Wno-volatile -Wno-pedantic)`
`33`	`34`
`34`	`35`	`target_link_libraries(ipfixprobe-input-dpdk PRIVATE`
`35`		`- telemetry::telemetry`
`36`	`36`	`${DPDK_LIBRARIES}`
`37`	`37`	`)`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ set_target_properties(ipfixprobe-input-nfb PROPERTIES`
`18`	`18`	`target_include_directories(ipfixprobe-input-nfb PRIVATE`
`19`	`19`	`${CMAKE_SOURCE_DIR}/include/`
`20`	`20`	`${CMAKE_SOURCE_DIR}/src/plugins/input/parser`
	`21`	`+ ${telemetry_SOURCE_DIR}/include`
`21`	`22`	`)`
`22`	`23`
`23`	`24`	`target_link_libraries(ipfixprobe-input-nfb PRIVATE`
`24`	`25`	`nfb::nfb`
`25`	`26`	`numa::numa`
`26`		`- telemetry::telemetry`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`install(TARGETS ipfixprobe-input-nfb`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ target_include_directories(ipfixprobe-input-pcap PRIVATE`
`15`	`15`	`${PCAP_INCLUDE_DIRS}`
`16`	`16`	`${CMAKE_SOURCE_DIR}/include/`
`17`	`17`	`${CMAKE_SOURCE_DIR}/src/plugins/input/parser`
	`18`	`+ ${telemetry_SOURCE_DIR}/include`
`18`	`19`	`)`
`19`	`20`
`20`	`21`	`target_compile_definitions(ipfixprobe-input-pcap PRIVATE`
`@@ -23,7 +24,6 @@ target_compile_definitions(ipfixprobe-input-pcap PRIVATE`
`23`	`24`
`24`	`25`	`target_link_libraries(ipfixprobe-input-pcap PRIVATE`
`25`	`26`	`${PCAP_LIBRARIES}`
`26`		`- telemetry::telemetry`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`install(TARGETS ipfixprobe-input-pcap`