From eed439a67a26f79f524bdad7e53516917f0b657e Mon Sep 17 00:00:00 2001 From: Frank Herchet Date: Fri, 24 Feb 2012 11:11:56 +0100 Subject: * [GAM-11]: modify cmake and add compile flag WITH_DLT --- AudioManagerDaemon/CMakeLists.txt | 52 +++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 13 deletions(-) (limited to 'AudioManagerDaemon/CMakeLists.txt') diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index 8e5297c..beb1a74 100644 --- 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}") -- cgit v1.2.1