diff options
| author | Christian Linke <christian.linke@bmw.de> | 2015-10-06 19:19:15 +0100 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2015-10-06 19:28:39 +0100 |
| commit | b8b2aa9fb51dcbc8a4c95de21ba1ac34c54c2043 (patch) | |
| tree | 4ae2390e8e08ead6e5a0b69774a8b41e17997a18 /AudioManagerUtilities/CMakeLists.txt | |
| parent | 32f74d1bd670c3a7623fa5cd52d96a7646152ccd (diff) | |
| download | audiomanager-b8b2aa9fb51dcbc8a4c95de21ba1ac34c54c2043.tar.gz | |
make changes in utilities compile
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerUtilities/CMakeLists.txt')
| -rw-r--r-- | AudioManagerUtilities/CMakeLists.txt | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/AudioManagerUtilities/CMakeLists.txt b/AudioManagerUtilities/CMakeLists.txt index 78967a6..7a0c5cc 100644 --- a/AudioManagerUtilities/CMakeLists.txt +++ b/AudioManagerUtilities/CMakeLists.txt @@ -26,8 +26,7 @@ INCLUDE_DIRECTORIES( ${INCLUDE_FOLDER} ${AUDIO_INCLUDE_FOLDER} ${AUDIOMANAGER_INCLUDE_FOLDER} - ${DBUS_INCLUDE_DIR} - ${DBUS_ARCH_INCLUDE_DIR} + ${DBUS_INCLUDE_DIRS} ${TCLAP_INCLUDE_DIR} ) @@ -43,18 +42,17 @@ SET(AUDIO_MANAGER_UTILITIES_SRCS_CXX src/CAmSocketHandler.cpp) IF (WITH_DBUS_WRAPPER) - FIND_PACKAGE(DBUS REQUIRED) + pkg_check_modules (DBUS "dbus-1 >= 1.4") ENDIF (WITH_DBUS_WRAPPER) IF (WITH_CAPI_WRAPPER) - FIND_PACKAGE(DBUS REQUIRED) FIND_PACKAGE(CommonAPI REQUIRED) ENDIF (WITH_CAPI_WRAPPER) IF (WITH_DBUS_WRAPPER) SET (AM_LINK_LIBS ${AM_LINK_LIBS} - ${DBUS_LIBRARY}) + ${DBUS_LIBRARIES}) SET(AUDIO_MANAGER_UTILITIES_SRCS_CXX ${AUDIO_MANAGER_UTILITIES_SRCS_CXX} src/CAmDbusWrapper.cpp) @@ -63,16 +61,14 @@ ENDIF (WITH_DBUS_WRAPPER) IF (WITH_CAPI_WRAPPER) SET(AM_LINK_LIBS ${AM_LINK_LIBS} - ${DBUS_LIBRARY} + ${DBUS_LIBRARIES} ${COMMON_API_LIBRARIES} ${COMMON_API_DBUS_LIBRARIES}) SET(AUDIO_MANAGER_UTILITIES_SRCS_CXX ${AUDIO_MANAGER_UTILITIES_SRCS_CXX} src/CAmCommonAPIWrapper.cpp) INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} - ${COMMON_API_INCLUDE_DIRS} - ${COMMON_API_DBUS_INCLUDE_DIRS} - ${COMMON_API_GEN_INCLUDE_DIR}) + ${COMMONAPI_INCLUDE_DIRS}) ENDIF (WITH_CAPI_WRAPPER) ADD_LIBRARY(AudioManagerUtilities ${LIBRARY_TYPE} ${AUDIO_MANAGER_UTILITIES_SRCS_CXX}) |