[GDLT-90] Implemented systemd watchdog concept in dlt-system

Signed-off-by: Christian Muck <christian.muck@bmw.de>

1 files changed, 17 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eba6689..fc4de91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ project( automotive-dlt )
 

 mark_as_advanced( CMAKE_BACKWARDS_COMPATIBILITY)

 set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )

+set( CMAKE_INSTALL_PREFIX "/usr" )

 

 # Set version parameters

 set( DLT_MAJOR_VERSION 2)

@@ -50,16 +51,20 @@ endif(NOT CMAKE_BUILD_TYPE)
 

 # Set of indiviual options

 option(BUILD_SHARED_LIBS      "Set to OFF to build static libraries"                 ON  )

-option(WITH_DLT_SHM_ENABLE    "Set to ON to use shared memory as IPC - experimental"    OFF )

+option(WITH_SYSTEMD           "Set to ON to create unit files and systemd check on dlt-daemon startup"           ON )

+option(WITH_SYSTEMD_WATCHDOG  "Set to ON to use the systemd watchdog in dlt-daemon"      ON)

 option(WITH_DOC               "Set to ON to build documentation target"              OFF )

-option(WITH_MAN               "Set to ON to build man pages"             OFF )

+option(WITH_MAN               "Set to ON to build man pages"             ON )

 option(WITH_CHECK_CONFIG_FILE "Set to ON to create a configure file of CheckIncludeFiles and CheckFunctionExists " OFF )

 option(WITH_TESTSCRIPTS       "Set to ON to run CMakeLists.txt in testscripts"       OFF )

-option(WITH_SYSTEMD           "Set to ON to create unit files and systemd check on dlt-daemon startup"           OFF )

-option(WITH_SYSTEMD_WATCHDOG  "Set to ON to use the systemd watchdog in dlt-daemon"      ON)

 option(WITH_GPROF             "Set -pg to compile flags"                             OFF )

 option(WITH_DLTTEST			  "Set to ON to build with modifications to test User-Daemon communication with corrupt messages" OFF)

-

+option(WITH_DLT_SHM_ENABLE    "EXPERIMENTAL! Set to ON to use shared memory as IPC. EXPERIMENTAL!"    OFF )

+option(WTIH_DLT_ADAPTOR       "Set ton ON to build src/adaptor binaries" ON)

+option(WITH_DLT_CONSOLE       "Set ton ON to build src/console binaries" ON)

+option(WITH_DLT_EXAMPLES      "Set ton ON to build src/examples binaries" ON)

+option(WITH_DLT_SYSTEM        "Set ton ON to build src/system binaries" ON)

+option(WITH_DLT_TESTS         "Set ton ON to build src/test binaries" ON)

 # RPM settings

 set( GENIVI_RPM_RELEASE "1")#${DLT_REVISION}")

 set( LICENSE "Mozilla Public License Version 2.0" )

@@ -91,6 +96,7 @@ if(WITH_GPROF)
 endif(WITH_GPROF)    

    

 add_definitions( "-Wall" )

+add_definitions( "-Wextra" )

 

 configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.spec.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.spec)

 configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)

@@ -124,11 +130,16 @@ message( STATUS "WITH_SYSTEMD = ${WITH_SYSTEMD}" )
 message( STATUS "WITH_SYSTEMD_WATCHDOG = ${WITH_SYSTEMD_WATCHDOG}" )

 message( STATUS "WITH_DOC = ${WITH_DOC}" )

 message( STATUS "WITH_MAN = ${WITH_MAN}" )

+message( STATUS "WTIH_DLT_ADAPTOR = ${WTIH_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_TESTS = ${WITH_DLT_TESTS}")

 message( STATUS "WITH_DLT_SHM_ENABLE = ${WITH_DLT_SHM_ENABLE}" )

+message( STATUS "WITH_DLTTEST = ${WITH_DLTTEST}" )

 message( STATUS "WITH_CHECK_CONFIG_FILE = ${WITH_CHECK_CONFIG_FILE}" )

 message( STATUS "WITH_TESTSCRIPTS = ${WITH_TESTSCRIPTS}" )

 message( STATUS "WITH_GPROF = ${WITH_GPROF}" )

-message( STATUS "WITH_DLTTEST = ${WITH_DLTTEST}" )

 message( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" )

 message( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )

 message( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" )