* [GAM-11]: modify cmake and add compile flag WITH_DLT

diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt
index 8e5297c..beb1a74 100644 (file)
--- a/AudioManagerDaemon/CMakeLists.txt
+++ b/AudioManagerDaemon/CMakeLists.txt
@@ -70,12 +70,17 @@ ENDIF(WITH_SOCKETHANDLER_LOOP)
 
 INCLUDE_DIRECTORIES(   
        ${CMAKE_SOURCE_DIR} 
-       ${CMAKE_CURRENT_BINARY_DIR}
-       ${DLT_INCLUDE_DIRS}
+       ${CMAKE_CURRENT_BINARY_DIR}     
        ${AUDIO_INCLUDES_FOLDER}
        ${INCLUDES_FOLDER}
 )
 
+IF(WITH_DLT)
+INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES}
+    ${DLT_INCLUDE_DIRS}
+)
+ENDIF(WITH_DLT)
+
 IF(WITH_DBUS_WRAPPER)
 INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES}
     ${DBUS_ARCH_INCLUDE_DIR}
@@ -86,18 +91,22 @@ ENDIF(WITH_DBUS_WRAPPER)
 ADD_EXECUTABLE(AudioManager ${AUDIOMAN_SRCS_CXX})
 
 IF(WITH_DBUS_WRAPPER)
-TARGET_LINK_LIBRARIES(AudioManager 
-       ${SQLITE_LIBRARIES}
-       ${DLT_LIBRARIES}
-       ${DBUS_LIBRARY}
-)
+    TARGET_LINK_LIBRARIES(AudioManager 
+       ${SQLITE_LIBRARIES}
+       ${DBUS_LIBRARY}
+    )
 ELSE(WITH_DBUS_WRAPPER)
     TARGET_LINK_LIBRARIES(AudioManager 
         ${SQLITE_LIBRARIES}
-        ${DLT_LIBRARIES}
-)
+    )
 ENDIF(WITH_DBUS_WRAPPER)
 
+IF(WITH_DLT)
+    TARGET_LINK_LIBRARIES(AudioManager
+        ${DLT_LIBRARIES}
+    )
+ENDIF(WITH_DLT)  
+
 IF(WITH_TESTS)
        add_subdirectory (test)
 ENDIF(WITH_TESTS)
@@ -123,9 +132,26 @@ INSTALL(DIRECTORY "${AUDIO_INCLUDES_FOLDER}/"
         COMPONENT dev
 )
 
-SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)")
-set_property(GLOBAL APPEND PROPERTY bin_prop "${ADD_DEPEND}")
+# General packet dependency
+SET(ADD_DEPEND_BIN_PROP "sqlite3(>=3.6.22)")
+
+# Optional packet dependency
+IF(WITH_DLT)
+    SET(ADD_DEPEND_BIN_PROP ${ADD_DEPEND_BIN_PROP} "dlt")
+ENDIF(WITH_DLT)
+
+IF(WITH_DBUS_WRAPPER)
+    SET(ADD_DEPEND_BIN_PROP ${ADD_DEPEND_BIN_PROP} "libdbus-1-3(>=1.2.16)")
+ENDIF()
+
+# Additional Dev packet dependency
+SET(ADD_DEPEND_DEV_PROP "audiomanager-bin" ${ADD_DEPEND_BIN_PROP})
+
+MESSAGE(STATUS "bin packet dependency: ${ADD_DEPEND_BIN_PROP}")
+MESSAGE(STATUS "dev dependency: ${ADD_DEPEND_DEV_PROP}")
+
+set_property(GLOBAL APPEND PROPERTY bin_prop "${ADD_DEPEND_BIN_PROP}")
+set_property(GLOBAL APPEND PROPERTY dev_prop "${ADD_DEPEND_DEV_PROP}")
+
 
-SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)")
-set_property(GLOBAL APPEND PROPERTY dev_prop "${ADD_DEPEND}")
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d33ca05..2ba0790 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,8 +46,13 @@ execute_process(COMMAND git log --pretty=short WORKING_DIRECTORY ${CMAKE_CURRENT
 
 PROJECT(AudioManagerDeamon)
 
+FIND_PACKAGE(PkgConfig)
+
 OPTION( WITH_DBUS_WRAPPER 
        "Enable Dbus Wrapper Support" ON )
+       
+OPTION( WITH_DLT 
+    "Enable automotive-DLT Support" ON )
 
 OPTION( WITH_SOCKETHANDLER_LOOP 
        "Enable SocketHandler Support (cannot work with SimpleDBusLoop)" ON )
@@ -128,8 +133,9 @@ SET(INTROSPECTION_COMMAND_XML_FILE "${AUDIO_INCLUDES_FOLDER}/dbus/CommandInterfa
 
 CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/config.cmake ${CMAKE_SOURCE_DIR}/includes/config.h )
 
-FIND_PACKAGE(PkgConfig)
-pkg_check_modules(DLT REQUIRED automotive-dlt)
+IF(WITH_DLT)    
+    pkg_check_modules(DLT REQUIRED automotive-dlt)
+ENDIF(WITH_DLT)
 
 IF(WITH_DOCUMENTATION)
        find_package(Doxygen)

diff --git a/cmake/config.cmake b/cmake/config.cmake
index c753c32..f5db584 100644 (file)
--- a/cmake/config.cmake
+++ b/cmake/config.cmake
@@ -4,6 +4,7 @@
 #cmakedefine DAEMONVERSION "@DAEMONVERSION@"
 
 #cmakedefine WITH_DBUS_WRAPPER
+#cmakedefine WITH_DLT
 #cmakedefine WITH_SOCKETHANDLER_LOOP 
 #cmakedefine WITH_SIMPLEDBUS_LOOP 
 #cmakedefine WITH_PPOLL