From da6eefe5cac244421c5af413c54e420717e11c9e Mon Sep 17 00:00:00 2001 From: ManikandanChockalingam Date: Fri, 18 May 2018 11:17:31 +0530 Subject: IPC: Unix socket added (#43) * IPC: Unix socket added The user can select either FIFO or UNIX socket as IPC between user library and daemon through CMakelist option. Socket path configurable for both FIFO and Unix Socket now configurable in CMake Signed-off-by: Christoph Lipka Signed-off-by: ManikandanC --- CMakeLists.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 55c8c1c..6445d06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ if( DLT_REVISION MATCHES "^$") set( PRINT_REVISION "Git revision unavailable") else( DLT_REVISION MATCHES "") string(REPLACE "-" "_" DLT_REVISION ${DLT_REVISION}) - set( PRINT_REVISION ${DLT_REVISION}) + set( PRINT_REVISION ${DLT_REVISION}) endif( DLT_REVISION MATCHES "^$") # set default build type, if not defined by user @@ -70,6 +70,7 @@ option(WITH_DLT_DBUS "Set to ON to build src/dbus binaries" option(WITH_DLT_TESTS "Set to ON to build src/test binaries" ON) option(WITH_DLT_UNIT_TESTS "Set to ON to build gtest framework and tests/binaries" OFF) +set(DLT_IPC "FIFO" CACHE STRING "UNIX_SOCKET,FIFO") set( DLT_USER "genivi" CACHE STRING "Set user for process not run as root") @@ -111,6 +112,15 @@ include_directories( add_definitions( -D_GNU_SOURCE ) +IF(${DLT_IPC} STREQUAL "UNIX_SOCKET") + add_definitions( -DDLT_USE_UNIX_SOCKET_IPC ) +ENDIF(${DLT_IPC} STREQUAL "UNIX_SOCKET") + +if(NOT DLT_USER_IPC_PATH) + set(DLT_USER_IPC_PATH "/tmp") +endif() +add_definitions( -DDLT_USER_IPC_PATH="${DLT_USER_IPC_PATH}" ) + if(WITH_DLTTEST) add_definitions( -DDLT_TEST_ENABLE) endif(WITH_DLTTEST) @@ -247,6 +257,7 @@ message( STATUS "CMAKE_HOST_SYSTEM_PROCESSOR = ${CMAKE_HOST_SYSTEM_PROCESSOR}" ) message( STATUS "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}" ) message( STATUS "WITH_DLT_LOGSTORAGE_CTRL_UDEV = ${WITH_DLT_LOGSTORAGE_CTRL_UDEV}" ) message( STATUS "WITH_DLT_LOGSTORAGE_CTRL_PROP = ${WITH_DLT_LOGSTORAGE_CTRL_PROP}" ) +message( STATUS "DLT_IPC = ${DLT_IPC} (Path: ${DLT_USER_IPC_PATH})" ) message( STATUS "Change a value with: cmake -D=" ) message( STATUS "-------------------------------------------------------------------------------" ) message( STATUS ) -- cgit v1.2.1