Add threadnames to libdlt threads.

[profile/ivi/dlt-daemon.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b29a5f9..054da7f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,9 +24,9 @@ set( CMAKE_INSTALL_PREFIX "/usr" )
 # Set version parameters\r
 set( DLT_MAJOR_VERSION 2)\r
 set( DLT_MINOR_VERSION 9)\r
-set( DLT_PATCH_LEVEL 0)\r
+set( DLT_PATCH_LEVEL 2)\r
 set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL})\r
-set( DLT_VERSION_STATE STABLE )\r
+set( DLT_VERSION_STATE ALPHA )\r
 set( DLT_REVISION "")\r
 \r
 execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} \r
@@ -53,6 +53,7 @@ endif(NOT CMAKE_BUILD_TYPE)
 option(BUILD_SHARED_LIBS      "Set to OFF to build static libraries"                                             ON  )\r
 option(WITH_SYSTEMD           "Set to ON to create unit files and systemd check on dlt-daemon startup"           OFF )\r
 option(WITH_SYSTEMD_WATCHDOG  "Set to ON to use the systemd watchdog in dlt-daemon"                              OFF)\r
+option(WITH_SYSTEMD_JOURNAL   "Set to ON to use the systemd journal in dlt-system"                               OFF)\r
 option(WITH_DOC               "Set to ON to build documentation target"                                          OFF )\r
 option(WITH_MAN               "Set to ON to build man pages"                                                     ON )\r
 option(WITH_CHECK_CONFIG_FILE "Set to ON to create a configure file of CheckIncludeFiles and CheckFunctionExists " OFF )\r
@@ -98,13 +99,19 @@ endif(WITH_GPROF)
 add_definitions( "-Wall" )\r
 add_definitions( "-Wextra" )\r
 \r
+IF(${WITH_DOC} STREQUAL "OFF")\r
+       SET(PACKAGE_DOC "#")\r
+ELSE (${WITH_DOC} STREQUAL "OFF")\r
+       SET(PACKAGE_DOC "")\r
+ENDIF(${WITH_DOC} STREQUAL "OFF")\r
+\r
 configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.spec.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.spec)\r
 configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)\r
 install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig COMPONENT devel)\r
 \r
 add_subdirectory( cmake )\r
 \r
-if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG)\r
+if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL)\r
     if(WITH_SYSTEMD)\r
         add_definitions( -DDLT_SYSTEMD_ENABLE)\r
     endif(WITH_SYSTEMD)\r
@@ -112,11 +119,15 @@ if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG)
     if(WITH_SYSTEMD_WATCHDOG)\r
         add_definitions( -DDLT_SYSTEMD_WATCHDOG_ENABLE)\r
     endif(WITH_SYSTEMD_WATCHDOG)\r
+\r
+    if(WITH_SYSTEMD_JOURNAL)\r
+        add_definitions( -DDLT_SYSTEMD_JOURNAL_ENABLE)\r
+    endif(WITH_SYSTEMD_JOURNAL)\r
     \r
     set( systemd_SRCS ${CMAKE_SOURCE_DIR}/systemd/3rdparty/sd-daemon.c)\r
     \r
     add_subdirectory( systemd )\r
-endif(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG)\r
+endif(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL)\r
 \r
 add_subdirectory( doc )\r
 add_subdirectory( src )\r
@@ -128,7 +139,9 @@ message( STATUS "---------------------------------------------------------------
 message( STATUS "Build for Version ${DLT_VERSION} build ${DLT_REVISION} version state ${DLT_VERSION_STATE}")\r
 message( STATUS "WITH_SYSTEMD = ${WITH_SYSTEMD}" )\r
 message( STATUS "WITH_SYSTEMD_WATCHDOG = ${WITH_SYSTEMD_WATCHDOG}" )\r
+message( STATUS "WITH_SYSTEMD_JOURNAL = ${WITH_SYSTEMD_JOURNAL}" )\r
 message( STATUS "WITH_DOC = ${WITH_DOC}" )\r
+\r
 message( STATUS "WITH_MAN = ${WITH_MAN}" )\r
 message( STATUS "WTIH_DLT_ADAPTOR = ${WTIH_DLT_ADAPTOR}")\r
 message( STATUS "WITH_DLT_CONSOLE = ${WITH_DLT_CONSOLE}")\r