From 95386672a2406e8878d4cad5ce48203d68b374c4 Mon Sep 17 00:00:00 2001 From: christian mueller Date: Fri, 27 Apr 2012 14:51:38 +0200 Subject: * [GAM-69] AudioManager tests does not compile without dlt installed (WITH_DLT=OFF) fixed Signed-off-by: christian mueller --- AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt | 5 ++++- AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt | 5 ++++- AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt | 5 ++++- AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt | 5 ++++- AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt | 5 ++++- AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt | 5 ++++- PluginCommandInterfaceDbus/test/CMakeLists.txt | 6 +++++- PluginControlInterface/test/CMakeLists.txt | 4 +++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt index b2a38da..213ccb1 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt @@ -23,7 +23,10 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioMan FIND_PACKAGE(PkgConfig) pkg_check_modules(SQLITE REQUIRED sqlite3) -pkg_check_modules(DLT REQUIRED automotive-dlt) + +IF(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) +ENDIF(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt index 305ed03..6d5b685 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt @@ -23,7 +23,10 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioMan FIND_PACKAGE(PkgConfig) pkg_check_modules(SQLITE REQUIRED sqlite3) -pkg_check_modules(DLT REQUIRED automotive-dlt) + +IF(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) +ENDIF(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt index e734366..906fe1a 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt @@ -23,7 +23,10 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioMan FIND_PACKAGE(PkgConfig) pkg_check_modules(SQLITE REQUIRED sqlite3) -pkg_check_modules(DLT REQUIRED automotive-dlt) + +IF(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) +ENDIF(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt index 6915a23..a797b67 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -24,7 +24,10 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManage FIND_PACKAGE(PkgConfig) pkg_check_modules(SQLITE REQUIRED sqlite3) -pkg_check_modules(DLT REQUIRED automotive-dlt) + +IF(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) +ENDIF(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt index 79ed13e..c5edaa7 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt @@ -30,7 +30,10 @@ set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include) FIND_PACKAGE(PkgConfig) -pkg_check_modules(DLT REQUIRED automotive-dlt) + +IF(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) +ENDIF(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index e5cc2fe..db69086 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -30,7 +30,10 @@ set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include) FIND_PACKAGE(PkgConfig) -pkg_check_modules(DLT REQUIRED automotive-dlt) + +IF(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) +ENDIF(WITH_DLT) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/PluginCommandInterfaceDbus/test/CMakeLists.txt b/PluginCommandInterfaceDbus/test/CMakeLists.txt index 08acb6b..5aa3e8d 100644 --- a/PluginCommandInterfaceDbus/test/CMakeLists.txt +++ b/PluginCommandInterfaceDbus/test/CMakeLists.txt @@ -30,7 +30,11 @@ find_package (Threads) FIND_PACKAGE(DBUS REQUIRED) FIND_PACKAGE(PkgConfig) find_package(PythonLibs REQUIRED) -pkg_check_modules(DLT REQUIRED automotive-dlt) + +IF(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) +ENDIF(WITH_DLT) + INCLUDE_DIRECTORIES( ${STD_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} diff --git a/PluginControlInterface/test/CMakeLists.txt b/PluginControlInterface/test/CMakeLists.txt index 8b5fb88..70a9339 100644 --- a/PluginControlInterface/test/CMakeLists.txt +++ b/PluginControlInterface/test/CMakeLists.txt @@ -23,7 +23,9 @@ FIND_PACKAGE(GTest REQUIRED) find_package (Threads) FIND_PACKAGE(PkgConfig) -pkg_check_modules(DLT REQUIRED automotive-dlt) +IF(WITH_DLT) + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) +ENDIF(WITH_DLT) INCLUDE_DIRECTORIES( ${STD_INCLUDE_DIRS} -- cgit v1.2.1