diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/system/CMakeLists.txt | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f68c59..e8e961a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,6 +144,8 @@ add_definitions(-DCONFIGURATION_FILES_DIR="${CONFIGURATION_FILES_DIR}") add_subdirectory( cmake ) if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL) + execute_process(COMMAND pkg-config --modversion systemd OUTPUT_VARIABLE SYSTEMD_VERSION) + if(WITH_SYSTEMD) add_definitions( -DDLT_SYSTEMD_ENABLE) endif(WITH_SYSTEMD) @@ -192,6 +194,9 @@ message( STATUS "WITH_TESTSCRIPTS = ${WITH_TESTSCRIPTS}" ) message( STATUS "WITH_GPROF = ${WITH_GPROF}" ) message( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" ) message( STATUS "TARGET_CPU_NAME = ${TARGET_CPU_NAME}" ) +if(WITH_SYSTEMD_JOURNAL) + message( STATUS "SYSTEMD_VERSION = ${SYSTEMD_VERSION}") +endif(WITH_SYSTEMD_JOURNAL) message( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" ) message( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" ) message( STATUS "CMAKE_HOST_SYSTEM_PROCESSOR = ${CMAKE_HOST_SYSTEM_PROCESSOR}" ) diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index 2213867..4cb9371 100644 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -23,8 +23,13 @@ set(dlt_system_SRCS dlt-system.c dlt-system-options.c dlt-system-process-handlin dlt-system-filetransfer.c dlt-system-logfile.c dlt-system-processes.c dlt-system-shell.c dlt-system-syslog.c dlt-system-watchdog.c dlt-system-journal.c) add_executable(dlt-system ${dlt_system_SRCS} ${systemd_SRCS}) + if(WITH_SYSTEMD_JOURNAL) - target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd-journal systemd-id128) + if(SYSTEMD_VERSION LESS 209) + target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd-journal systemd-id128) + else(SYSTEMD_VERSION LESS 209) + target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd) + endif(SYSTEMD_VERSION LESS 209) else(WITH_SYSTEMD_JOURNAL) target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES}) endif(WITH_SYSTEMD_JOURNAL) |