\r
# Set version parameters\r
set( DLT_MAJOR_VERSION 2)\r
-set( DLT_MINOR_VERSION 7)\r
-set( DLT_PATCH_LEVEL 0)\r
+set( DLT_MINOR_VERSION 9)\r
+set( DLT_PATCH_LEVEL 2)\r
set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL})\r
set( DLT_VERSION_STATE ALPHA )\r
set( DLT_REVISION "")\r
endif(NOT CMAKE_BUILD_TYPE)\r
\r
# Set of indiviual options\r
-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" ON )\r
-option(WITH_SYSTEMD_WATCHDOG "Set to ON to use the systemd watchdog in dlt-daemon" ON)\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(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
-option(WITH_TESTSCRIPTS "Set to ON to run CMakeLists.txt in testscripts" OFF )\r
-option(WITH_GPROF "Set -pg to compile flags" OFF )\r
+option(WITH_TESTSCRIPTS "Set to ON to run CMakeLists.txt in testscripts" OFF )\r
+option(WITH_GPROF "Set -pg to compile flags" OFF )\r
option(WITH_DLTTEST "Set to ON to build with modifications to test User-Daemon communication with corrupt messages" OFF)\r
-option(WITH_DLT_SHM_ENABLE "EXPERIMENTAL! Set to ON to use shared memory as IPC. EXPERIMENTAL!" OFF )\r
-option(WTIH_DLT_ADAPTOR "Set ton ON to build src/adaptor binaries" ON)\r
-option(WITH_DLT_CONSOLE "Set ton ON to build src/console binaries" ON)\r
-option(WITH_DLT_EXAMPLES "Set ton ON to build src/examples binaries" ON)\r
-option(WITH_DLT_SYSTEM "Set ton ON to build src/system binaries" ON)\r
-option(WITH_DLT_TESTS "Set ton ON to build src/test binaries" ON)\r
+option(WITH_DLT_SHM_ENABLE "EXPERIMENTAL! Set to ON to use shared memory as IPC. EXPERIMENTAL!" OFF )\r
+option(WTIH_DLT_ADAPTOR "Set ton ON to build src/adaptor binaries" ON)\r
+option(WITH_DLT_CONSOLE "Set ton ON to build src/console binaries" ON)\r
+option(WITH_DLT_EXAMPLES "Set ton ON to build src/examples binaries" ON)\r
+option(WITH_DLT_SYSTEM "Set ton ON to build src/system binaries" ON)\r
+option(WITH_DLT_TESTS "Set ton ON to build src/test binaries" ON)\r
# RPM settings\r
set( GENIVI_RPM_RELEASE "1")#${DLT_REVISION}")\r
set( LICENSE "Mozilla Public License Version 2.0" )\r
if(WITH_GPROF)\r
SET(CMAKE_C_FLAGS "-pg")\r
endif(WITH_GPROF) \r
-
-add_definitions( "-Wall" )
+ \r
+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
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
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
projects / profile / ivi / dlt-daemon.git / blobdiff