++ lz4 unwind deps

Author: Zadamsa

cmake/dependencies.cmake

@@ -1,9 +1,15 @@
 find_package(PkgConfig REQUIRED)
 
-#pkg_check_modules(pthread REQUIRED libpthread)
-pkg_check_modules(unwind REQUIRED libunwind)
-#pkg_check_modules(atomic REQUIRED libatomic)
-pkg_check_modules(xxhash REQUIRED xxhash-devel)
+find_package(unwind REQUIRED)
+find_package(Threads REQUIRED)
+#find_package(Atomic REQUIRED)
+find_library(ATOMIC_LIBRARY NAMES atomic)
+find_library(DL_LIBRARY NAMES dl)
+find_package(lz4 REQUIRED)
+
+if(NOT DL_LIBRARY)
+	message(FATAL_ERROR "dl library not found!")
+endif()
 
 if (ENABLE_INPUT_PCAP)
 	pkg_check_modules(PCAP REQUIRED libpcap)

cmake/modules/Findlz4.cmake

@@ -0,0 +1,45 @@
+# Find lz4
+# Once done this will define
+#
+#  LZ4_FOUND - system has liblz4
+#  lz4::lz4 - cmake target 
+
+find_package(PkgConfig QUIET)
+if (PKG_CONFIG_FOUND)
+	pkg_check_modules(PC_LZ4 QUIET lz4-devel)
+endif()
+
+find_path (LZ4_INCLUDE_DIR 
+  NAMES lz4.h
+  HINTS ${LZ4_ROOT} ${PC_LZ4_INCLUDEDIR} ${PC_LZ4_INCLUDE_DIRS}
+  PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR}
+)
+
+find_library (LZ4_LIBRARY 
+  NAMES lz4
+  HINTS ${LZ4_ROOT} ${PC_LZ4_LIBDIR} ${PC_LZ4_LIBRARY_DIRS}
+  PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR}  
+)
+
+mark_as_advanced (LZ4_INCLUDE_DIR LZ4_LIBRARY)
+
+include (FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set Unwind_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args (lz4
+  REQUIRED_VARS LZ4_INCLUDE_DIR LZ4_LIBRARY
+)
+
+if (NOT TARGET lz4::lz4)
+  add_library(lz4::lz4 STATIC IMPORTED)
+  set_target_properties(lz4::lz4 PROPERTIES
+    IMPORTED_LOCATION "${LZ4_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${LZ4_INCLUDE_DIR}")
+  target_compile_definitions(lz4::lz4 INTERFACE LZ4_FOUND)
+else()
+  message(CRITICAL "lz4 was not found")
+  add_library(lz4::lz4 INTERFACE IMPORTED)
+endif()
+
+unset(LZ4_INCLUDE_DIR)
+unset(LZ4_LIBRARY)

cmake/modules/Findunwind.cmake

@@ -0,0 +1,45 @@
+# Find unwind library
+# Once done this will define
+#
+#  UNWIND_FOUND - system has libunwind
+#  unwind::unwind - cmake target 
+
+find_package(PkgConfig QUIET)
+if (PKG_CONFIG_FOUND)
+	pkg_check_modules(PC_UNWIND QUIET libunwind)
+endif()
+
+find_path (UNWIND_INCLUDE_DIR 
+  NAMES unwind.h libunwind.h
+  HINTS ${UNWIND_ROOT} ${PC_UNWIND_INCLUDEDIR} ${PC_UNWIND_INCLUDE_DIRS}
+  PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR}
+)
+
+find_library (UNWIND_LIBRARY 
+  NAMES unwind
+  HINTS ${UNWIND_ROOT} ${PC_UNWIND_LIBDIR} ${PC_UNWIND_LIBRARY_DIRS}
+  PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR}  
+)
+
+mark_as_advanced (UNWIND_INCLUDE_DIR UNWIND_LIBRARY)
+
+include (FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set Unwind_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args (unwind
+  REQUIRED_VARS UNWIND_INCLUDE_DIR UNWIND_LIBRARY
+)
+
+if (UNWIND_FOUND AND NOT TARGET unwind::unwind)
+  add_library(unwind::unwind STATIC IMPORTED)
+  set_target_properties(unwind::unwind PROPERTIES
+    IMPORTED_LOCATION "${UNWIND_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${UNWIND_INCLUDE_DIR}")
+  target_compile_definitions(unwind::unwind INTERFACE UNWIND_FOUND)
+else()
+  message(WARNING "Notice: UNWIND not found, no unwind support")
+  add_library(unwind::unwind INTERFACE IMPORTED)
+endif()
+
+unset(UNWIND_INCLUDE_DIR)
+unset(UNWIND_LIBRARY)

src/core/CMakeLists.txt

@@ -34,7 +34,7 @@ target_link_libraries(ipfixprobe PRIVATE
 	spdlog::spdlog
 	pthread
 	atomic
-	unwind
+	unwind::unwind
 	#ipfixprobe-storage-cache
 	#ipfixprobe-process-basicplus
 	#ipfixprobe-process-bstats

src/plugins/output/ipfix/CMakeLists.txt

@@ -8,7 +8,7 @@ add_library(ipfixprobe-output-ipfix SHARED
 
 target_include_directories(ipfixprobe-output-ipfix PRIVATE ${CMAKE_SOURCE_DIR}/include/)
 
-target_link_libraries(ipfixprobe-output-ipfix PRIVATE lz4)
+target_link_libraries(ipfixprobe-output-ipfix PRIVATE lz4::lz4)
 
 install(
     TARGETS ipfixprobe-output-ipfix