From bf8c172c1c9f385d1534e8af3fbe7d528cd811b2 Mon Sep 17 00:00:00 2001 From: Alexander Wenzel Date: Mon, 16 Dec 2013 10:12:37 +0100 Subject: Bug 3 - Cmake does not check for zlib for dlt-daemon compilation. Signed-off-by: Alexander Wenzel --- CMakeLists.txt | 1 + src/system/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 054da7f..983b2de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,7 @@ set( LICENSE "Mozilla Public License Version 2.0" ) # Build, project and include settings find_package(Threads REQUIRED) +find_package(ZLIB REQUIRED) include_directories( ${CMAKE_SOURCE_DIR}/ diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index d78b2e9..ce87914 100644 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -23,9 +23,9 @@ set(dlt_system_SRCS dlt-system.c dlt-system-options.c dlt-system-process-handlin 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 z systemd-journal systemd-id128) + target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd-journal systemd-id128) else(WITH_SYSTEMD_JOURNAL) - target_link_libraries(dlt-system dlt z) + target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES}) endif(WITH_SYSTEMD_JOURNAL) set_target_properties(dlt-system PROPERTIES LINKER_LANGUAGE C) -- cgit v1.2.1