diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/core_dump_handler/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/system/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | src/system/dlt-system-process-handling.c | 2 |
4 files changed, 25 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b9f8c51..bfc9058 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ option(WITH_DLT_SHM_ENABLE "EXPERIMENTAL! Set to ON to use shared memory as I option(WITH_DLT_ADAPTOR "Set to ON to build src/adaptor binaries" OFF) option(WITH_DLT_CONSOLE "Set to ON to build src/console binaries" ON) option(WITH_DLT_EXAMPLES "Set to ON to build src/examples binaries" ON) +option(WITH_DLT_FILETRANSFER "Set to ON to build dlt-system with filetransfer support" OFF) option(WITH_DLT_SYSTEM "Set to ON to build src/system binaries" OFF) option(WITH_DLT_DBUS "Set to ON to build src/dbus binaries" OFF) option(WITH_DLT_TESTS "Set to ON to build src/test binaries" ON) @@ -86,7 +87,7 @@ set(LICENSE "Mozilla Public License Version 2.0") # Build, project and include settings find_package(Threads REQUIRED) -if(WITH_DLT_SYSTEM) +if(WITH_DLT_COREDUMPHANDLER OR WITH_DLT_FILETRANSFER) set(ZLIB_LIBRARY "-lz") find_package(ZLIB REQUIRED) else() @@ -236,6 +237,7 @@ message(STATUS "WITH_DLT_ADAPTOR = ${WITH_DLT_ADAPTOR}") message(STATUS "WITH_DLT_CONSOLE = ${WITH_DLT_CONSOLE}") message(STATUS "WITH_DLT_EXAMPLES = ${WITH_DLT_EXAMPLES}") message(STATUS "WITH_DLT_SYSTEM = ${WITH_DLT_SYSTEM}") +message(STATUS "WITH_DLT_FILETRANSFER = ${WITH_DLT_FILETRANSFER}") message(STATUS "WITH_DLT_DBUS = ${WITH_DLT_DBUS}") message(STATUS "WITH_DLT_TESTS = ${WITH_DLT_TESTS}") message(STATUS "WITH_DLT_UNIT_TESTS = ${WITH_DLT_UNIT_TESTS}") diff --git a/src/core_dump_handler/CMakeLists.txt b/src/core_dump_handler/CMakeLists.txt index dcb5dd4..d77ba4c 100644 --- a/src/core_dump_handler/CMakeLists.txt +++ b/src/core_dump_handler/CMakeLists.txt @@ -29,7 +29,7 @@ if(WITH_DLT_COREDUMPHANDLER) endif(WITH_CITYHASH) add_executable(dlt-cdh ${dlt_cdh_SRCS}) - target_link_libraries(dlt-cdh z) + target_link_libraries(dlt-cdh ${ZLIB_LIBRARY}) set_target_properties(dlt-cdh PROPERTIES LINKER_LANGUAGE C) configure_file(${PROJECT_SOURCE_DIR}/src/core_dump_handler/50-coredump.conf.cmake ${PROJECT_BINARY_DIR}/core_dump_handler/50-coredump.conf) diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index 7de07ef..a0b9bf0 100644 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -18,20 +18,30 @@ if(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD OR WITH_SYSTEMD_JOURNAL) endif(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD OR WITH_SYSTEMD_JOURNAL) set(dlt_system_SRCS dlt-system.c dlt-system-options.c dlt-system-process-handling.c - 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) + dlt-system-logfile.c dlt-system-processes.c dlt-system-shell.c + dlt-system-syslog.c dlt-system-watchdog.c dlt-system-journal.c) + +if(WITH_DLT_FILETRANSFER) + set(dlt_system_SRCS ${dlt_system_SRCS} dlt-system-filetransfer.c) + add_definitions(-DDLT_FILETRANSFER_ENABLE) +endif(WITH_DLT_FILETRANSFER) + add_executable(dlt-system ${dlt_system_SRCS} ${systemd_SRCS}) +target_link_libraries(dlt-system dlt) + if(WITH_SYSTEMD_JOURNAL) - 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}) + if(SYSTEMD_VERSION LESS 209) + target_link_libraries(dlt-system systemd-journal systemd-id128) + else(SYSTEMD_VERSION LESS 209) + target_link_libraries(dlt-system systemd) + endif(SYSTEMD_VERSION LESS 209) endif(WITH_SYSTEMD_JOURNAL) +if(WITH_DLT_FILETRANSFER) + target_link_libraries(dlt-system ${ZLIB_LIBRARY}) +endif(WITH_DLT_FILETRANSFER) + set_target_properties(dlt-system PROPERTIES LINKER_LANGUAGE C) diff --git a/src/system/dlt-system-process-handling.c b/src/system/dlt-system-process-handling.c index af6ba66..eb310b0 100644 --- a/src/system/dlt-system-process-handling.c +++ b/src/system/dlt-system-process-handling.c @@ -128,8 +128,10 @@ void start_threads(DltSystemConfiguration *config) if (config->LogFile.Enable) start_thread(config, logfile_thread, "log file"); +#if defined(DLT_FILETRANSFER_ENABLE) if (config->Filetransfer.Enable) start_thread(config, filetransfer_thread, "file transfer"); +#endif if (config->LogProcesses.Enable) start_thread(config, logprocess_thread, "log process"); |