From a8d57d390bb676602031e3f1bac5f75d67e16170 Mon Sep 17 00:00:00 2001 From: Saya Sugiura Date: Wed, 28 Jul 2021 11:46:38 +0900 Subject: console: Add cmake options for control and timestamp Following cmake options are introduced in order to build and install only minimum sets from src/console - WITH_DLT_CONSOLE_WO_CTRL: Set to ON not to build control commands under src/console (Default OFF) - WITH_DLT_CONSOLE_WO_SBTM: Set to ON not to build dlt-sortbytimestamp under src/console (Default OFF) Signed-off-by: Saya Sugiura --- CMakeLists.txt | 4 ++++ src/console/CMakeLists.txt | 26 ++++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a45c3c6..425befa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,8 @@ option(WITH_DLTTEST "Set to ON to build with modifications to test Use option(WITH_DLT_SHM_ENABLE "EXPERIMENTAL! Set to ON to use shared memory as IPC. EXPERIMENTAL!" OFF) 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_CONSOLE_WO_CTRL "Set to ON not to build control commands under src/console" OFF) +option(WITH_DLT_CONSOLE_WO_SBTM "Set to ON not to build dlt-sortbytimestamp under src/console" OFF) 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) @@ -282,6 +284,8 @@ message(STATUS "WITH_DOC = ${WITH_DOC}") message(STATUS "WITH_MAN = ${WITH_MAN}") message(STATUS "WITH_DLT_ADAPTOR = ${WITH_DLT_ADAPTOR}") message(STATUS "WITH_DLT_CONSOLE = ${WITH_DLT_CONSOLE}") +message(STATUS "WITH_DLT_CONSOLE_WO_CTRL = ${WITH_DLT_CONSOLE_WO_CTRL}") +message(STATUS "WITH_DLT_CONSOLE_WO_SBTM = ${WITH_DLT_CONSOLE_WO_SBTM}") message(STATUS "WITH_DLT_EXAMPLES = ${WITH_DLT_EXAMPLES}") message(STATUS "WITH_DLT_SYSTEM = ${WITH_DLT_SYSTEM}") message(STATUS "WITH_DLT_FILETRANSFER = ${WITH_DLT_FILETRANSFER}") diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt index b2b731a..521e464 100644 --- a/src/console/CMakeLists.txt +++ b/src/console/CMakeLists.txt @@ -17,22 +17,20 @@ set(dlt_control_common_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/dlt-control-common.c) add_library(dlt_control_common_lib STATIC ${dlt_control_common_SRCS}) target_link_libraries(dlt_control_common_lib dlt ${DLT_JSON_LIBRARY}) -add_subdirectory(logstorage) +set(TARGET_LIST dlt-convert dlt-receive) -set(dlt-sortbytimestamp_SRCS dlt-sortbytimestamp.c) -set(dlt-convert_SRCS dlt-convert.c) -set(dlt-receive_SRCS dlt-receive.c) -set(dlt-control_SRCS dlt-control.c ${dlt_control_common_SRCS}) -set(dlt-passive-node-ctrl_SRCS dlt-passive-node-ctrl.c ${dlt_control_common_SRCS}) +if(NOT WITH_DLT_CONSOLE_WO_CTRL) + add_subdirectory(logstorage) + list(APPEND TARGET_LIST dlt-control dlt-passive-node-ctrl) +endif() -foreach(target - dlt-sortbytimestamp - dlt-convert - dlt-receive - dlt-control - dlt-passive-node-ctrl - ) - add_executable(${target} ${${target}_SRCS}) +if(NOT WITH_DLT_CONSOLE_WO_SBTM) + list(APPEND TARGET_LIST dlt-sortbytimestamp) +endif() + +foreach(target IN LISTS TARGET_LIST) + set(target_SRCS ${target}) + add_executable(${target} ${target_SRCS}) target_link_libraries(${target} dlt dlt_control_common_lib) set_target_properties(${target} PROPERTIES LINKER_LANGUAGE C) -- cgit v1.2.1