Unirec output: improved detection of libtrap and libunirec (added version extraction)

Author: Lukas955

extra_plugins/output/unirec/CMakeLists.txt

@@ -21,7 +21,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules")
 # Find IPFIXcol and libnf
 find_package(IPFIXcol2 2.0.0 REQUIRED)
 find_package(LibTrap REQUIRED)
-find_package(Unirec REQUIRED)
+find_package(LibUnirec REQUIRED)
 
 # Set default build type if not specified by user
 if (NOT CMAKE_BUILD_TYPE)
@@ -49,7 +49,7 @@ configure_file(
 include_directories(
     "${IPFIXCOL2_INCLUDE_DIRS}"  # IPFIXcol2 header files
     "${LIBTRAP_INCLUDE_DIRS}"    # libtrap header files
-    "${UNIREC_INCLUDE_DIRS}"     # unirec header files
+    "${LIBUNIREC_INCLUDE_DIRS}"  # unirec header files
 )
 
 # Create a linkable module
@@ -67,7 +67,7 @@ add_library(unirec-output MODULE
 
 target_link_libraries(unirec-output
     ${LIBTRAP_LIBRARIES}               # libtrap
-    ${UNIREC_LIBRARIES}                # unirec
+    ${LIBUNIREC_LIBRARIES}             # unirec
     m                                  # standard math library
 )
 

extra_plugins/output/unirec/CMakeModules/FindLibTrap.cmake

@@ -5,30 +5,53 @@
 
 # use pkg-config to get the directories and then use these values
 # in the find_path() and find_library() calls
-find_package(PkgConfig)
-pkg_check_modules(PC_LIBTRAP QUIET LibTrap)
+find_package(PkgConfig QUIET)
+if (PKG_CONFIG_FOUND)
+	pkg_check_modules(PC_LIBTRAP QUIET "libtrap")
+endif()
 set(LIBTRAP_DEFINITIONS ${PC_LIBTRAP_CFLAGS_OTHER})
 
 find_path(
-	LIBTRAP_INCLUDE_DIR trap.h
+	LIBTRAP_INCLUDE_DIR libtrap/trap.h
 	HINTS ${PC_LIBTRAP_INCLUDEDIR} ${PC_LIBTRAP_INCLUDE_DIRS}
-	PATH_SUFFIXES include/libtrap
+	PATH_SUFFIX include
 )
 
 find_library(
-	LIBTRAP_LIBRARY NAMES trap
+	LIBTRAP_LIBRARY NAMES trap libtrap
 	HINTS ${PC_LIBTRAP_LIBDIR} ${PC_LIBTRAP_LIBRARY_DIRS}
 	PATH_SUFFIXES lib lib64
 )
 
-# handle the QUIETLY and REQUIRED arguments and set LIBLIBTRAP_FOUND to TRUE
+if (PC_LIBTRAP_VERSION)
+	# Version extracted from pkg-config
+	set(LIBTRAP_VERSION_STRING ${PC_LIBTRAP_VERSION})
+elseif (LIBTRAP_INCLUDE_DIR AND LIBTRAP_LIBRARY)
+	# Try to get the version of the installed library
+	try_run(
+		TRAP_RES_RUN TRAP_RES_COMP
+		${CMAKE_CURRENT_BINARY_DIR}/try_run/trap_version_test/
+		${PROJECT_SOURCE_DIR}/CMakeModules/try_run/trap_version.c
+		CMAKE_FLAGS
+		  -DLINK_LIBRARIES=${LIBTRAP_LIBRARY}
+		  -DINCLUDE_DIRECTORIES=${LIBTRAP_INCLUDE_DIR}
+		RUN_OUTPUT_VARIABLE LIBTRAP_VERSION_VAR
+    )
+
+	if (TRAP_RES_COMP AND TRAP_RES_RUN EQUAL 0)
+		# Successfully compiled and executed with return code 0
+		set(LIBTRAP_VERSION_STRING ${LIBTRAP_VERSION_VAR})
+	endif()
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set LIBTRAP_FOUND to TRUE
 # if all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(libtrap
+find_package_handle_standard_args(LibTrap
 	REQUIRED_VARS LIBTRAP_LIBRARY LIBTRAP_INCLUDE_DIR
 	VERSION_VAR LIBTRAP_VERSION_STRING
 )
 
 set(LIBTRAP_LIBRARIES ${LIBTRAP_LIBRARY})
 set(LIBTRAP_INCLUDE_DIRS ${LIBTRAP_INCLUDE_DIR})
-mark_as_advanced(LIBTRAP_INCLUDE_DIR LIBTRAP_LIBRARIES)
+mark_as_advanced(LIBTRAP_INCLUDE_DIR LIBTRAP_LIBRARY)

extra_plugins/output/unirec/CMakeModules/FindLibUnirec.cmake

@@ -0,0 +1,42 @@
+#  LIBUNIREC_FOUND - System has libfds
+#  LIBUNIREC_INCLUDE_DIRS - The libfds include directories
+#  LIBUNIREC_LIBRARIES - The libraries needed to use libfds
+#  LIBUNIREC_DEFINITIONS - Compiler switches required for using libfds
+
+# use pkg-config to get the directories and then use these values
+# in the find_path() and find_library() calls
+find_package(PkgConfig QUIET)
+if (PKG_CONFIG_FOUND)
+	pkg_check_modules(PC_UNIREC QUIET "unirec")
+endif()
+set(LIBUNIREC_DEFINITIONS ${PC_UNIREC_CFLAGS_OTHER})
+
+find_path(
+	UNIREC_INCLUDE_DIR unirec/unirec.h
+	HINTS ${PC_UNIREC_INCLUDEDIR} ${PC_UNIREC_INCLUDE_DIRS}
+	PATH_SUFFIXES include
+)
+
+find_library(
+	UNIREC_LIBRARY NAMES unirec libunirec
+	HINTS ${PC_UNIREC_LIBDIR} ${PC_UNIREC_LIBRARY_DIRS}
+	PATH_SUFFIXES lib lib64
+)
+
+if (PC_UNIREC_VERSION)
+	# Version extracted from pkg-config
+	set(UNIREC_VERSION_STRING ${PC_UNIREC_VERSION})
+endif()
+
+
+# handle the QUIETLY and REQUIRED arguments and set LIBUNIREC_FOUND to TRUE
+# if all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LibUnirec
+	REQUIRED_VARS UNIREC_LIBRARY UNIREC_INCLUDE_DIR
+	VERSION_VAR UNIREC_VERSION_STRING
+)
+
+set(LIBUNIREC_LIBRARIES ${UNIREC_LIBRARY})
+set(LIBUNIREC_INCLUDE_DIRS ${UNIREC_INCLUDE_DIR})
+mark_as_advanced(UNIREC_INCLUDE_DIR UNIREC_LIBRARY)

extra_plugins/output/unirec/CMakeModules/FindUnirec.cmake

@@ -0,0 +1,10 @@
+#include <libtrap/trap.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+    printf("%s", trap_version);
+    return EXIT_SUCCESS;
+}