Merge pull request #364 from alexmohr/make-adaptor-configurable

cmake: Add option to enable each adaptor by itself

4 files changed, 27 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e88f886..8aaa403 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,9 @@ option(WITH_TESTSCRIPTS       "Set to ON to run CMakeLists.txt in testscripts"
 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(WITH_DLT_ADAPTOR       "Set to ON to build src/adaptor binaries"                                          OFF)
+option(WITH_DLT_ADAPTOR       "Set to ON to build src/adaptor binaries"                                          OFF) 
+option(WITH_DLT_ADAPTOR_STDIN "Set to ON to build src/adaptor/stdin binaries"                                    OFF)
+option(WITH_DLT_ADAPTOR_UDP   "Set to ON to build src/adaptor/udp 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)
@@ -285,6 +287,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_ADAPTOR_UDP = ${WITH_DLT_ADAPTOR_UDP}")
+message(STATUS "WITH_DLT_CONSOLE = ${WITH_DLT_CONSOLE}")
 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}")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e4ff133..6255336 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,9 +25,9 @@ if( WITH_DLT_EXAMPLES )
     add_subdirectory( examples )
 endif( WITH_DLT_EXAMPLES )
 
-if( WITH_DLT_ADAPTOR )
+if( WITH_DLT_ADAPTOR_STDIN OR WITH_DLT_ADAPTOR_UDP OR WITH_DLT_ADAPTOR )
     add_subdirectory( adaptor )
-endif( WITH_DLT_ADAPTOR )
+endif( WITH_DLT_ADAPTOR_STDIN OR WITH_DLT_ADAPTOR_UDP OR WITH_DLT_ADAPTOR )
 
 if( WITH_DLT_TESTS )
     add_subdirectory( tests )
diff --git a/src/adaptor/CMakeLists.txt b/src/adaptor/CMakeLists.txt
index 93d6ec5..aa9b9d1 100644
--- a/src/adaptor/CMakeLists.txt
+++ b/src/adaptor/CMakeLists.txt
@@ -13,18 +13,24 @@
 # For further information see http://www.genivi.org/.
 #######
 
-set(dlt_adaptor_stdin_SRCS dlt-adaptor-stdin.c)
-add_executable(dlt-adaptor-stdin ${dlt_adaptor_stdin_SRCS})
-target_link_libraries(dlt-adaptor-stdin dlt)
-set_target_properties(dlt-adaptor-stdin PROPERTIES LINKER_LANGUAGE C)
+if (WITH_DLT_ADAPTOR_STDIN OR WITH_DLT_ADAPTOR)
+	set(dlt_adaptor_stdin_SRCS dlt-adaptor-stdin.c)
+	add_executable(dlt-adaptor-stdin ${dlt_adaptor_stdin_SRCS})
+	target_link_libraries(dlt-adaptor-stdin dlt)
+	set_target_properties(dlt-adaptor-stdin PROPERTIES LINKER_LANGUAGE C)
 
-set(dlt_adaptor_udp_SRCS dlt-adaptor-udp.c)
-add_executable(dlt-adaptor-udp ${dlt_adaptor_udp_SRCS})
-target_link_libraries(dlt-adaptor-udp dlt)
-set_target_properties(dlt-adaptor-udp PROPERTIES LINKER_LANGUAGE C)
-
-install(TARGETS dlt-adaptor-stdin dlt-adaptor-udp
-	RUNTIME DESTINATION bin
-	COMPONENT base)
+	install(TARGETS dlt-adaptor-stdin
+		RUNTIME DESTINATION bin
+		COMPONENT base)
+endif()
 
+if (WITH_DLT_ADAPTOR_UDP OR WITH_DLT_ADAPTOR)
+	set(dlt_adaptor_udp_SRCS dlt-adaptor-udp.c)
+	add_executable(dlt-adaptor-udp ${dlt_adaptor_udp_SRCS})
+	target_link_libraries(dlt-adaptor-udp dlt)
+	set_target_properties(dlt-adaptor-udp PROPERTIES LINKER_LANGUAGE C)
 
+	install(TARGETS dlt-adaptor-stdin
+		RUNTIME DESTINATION bin
+		COMPONENT base)
+endif()
diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 4586a05..bb6f0a3 100644
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -53,7 +53,7 @@ if(WITH_SYSTEMD)
         install(FILES ${PROJECT_BINARY_DIR}/systemd/dlt-example-user.service DESTINATION ${SYSTEMD_CONFIGURATIONS_FILES_DIR} )
     endif(WITH_DLT_EXAMPLES)
 
-    if(WITH_DLT_ADAPTOR)
+    if(WITH_DLT_ADAPTOR_UDP)
         set( DLT_ADAPTOR_UDP_APPID "DUDP" )
         set( DLT_ADAPTOR_UDP_CTID "DCTI" )
         set( DLT_ADAPTOR_UDP_PORT 4712 )
@@ -61,7 +61,7 @@ if(WITH_SYSTEMD)
         message( STATUS "Configured systemd unit file:dlt-adaptor-udp.service" )
         message(STATUS "DLT adaptor udp configuration: APPID=${DLT_ADAPTOR_UDP_APPID} CTID=${DLT_ADAPTOR_UDP_CTID} PORT=${DLT_ADAPTOR_UDP_PORT}" )
         install(FILES ${PROJECT_BINARY_DIR}/systemd/dlt-adaptor-udp.service DESTINATION ${SYSTEMD_CONFIGURATIONS_FILES_DIR} )
-    endif(WITH_DLT_ADAPTOR)
+    endif(WITH_DLT_ADAPTOR_UDP)
 
     message(STATUS "Unit files will be installed to ${SYSTEMD_CONFIGURATIONS_FILES_DIR} after make install" )