diff options
| author | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-10-02 13:09:08 +0200 |
|---|---|---|
| committer | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-10-02 13:09:08 +0200 |
| commit | 6b730d5d2f993a7acddba2ba7ed649ef308a8e8e (patch) | |
| tree | 4654ae96abe125990766bc172b566b19520c9205 /AudioManagerDaemon | |
| parent | bd7ec24a2abe47ae4398b23282e8288e00eaec47 (diff) | |
| download | audiomanager-6b730d5d2f993a7acddba2ba7ed649ef308a8e8e.tar.gz | |
* Settings for commonAPI without binding code.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon')
| -rw-r--r-- | AudioManagerDaemon/CMakeLists.txt | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index ff8b70e..c08ca77 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -49,14 +49,18 @@ if(WITH_DBUS_WRAPPER) pkg_check_modules (DBUS "dbus-1 >= 1.4") endif(WITH_DBUS_WRAPPER) -if(WITH_CAPI_WRAPPER) - find_package(CommonAPI REQUIRED) -endif(WITH_CAPI_WRAPPER) - set (AM_LINK_LIBS ${CMAKE_DL_LIBS} rt) +if(WITH_CAPI_WRAPPER) + find_package(CommonAPI 3.1.3 REQUIRED) + string(REPLACE "." "" COMMONAPI_VERSION_NUMBER ${CommonAPI_VERSION}) + SET(COMMONAPI_VERSION_NUMBER ${COMMONAPI_VERSION_NUMBER} CACHE INTERNAL "hide this!" FORCE) + SET(CommonAPI_VERSION ${CommonAPI_VERSION} PARENT_SCOPE) +endif(WITH_CAPI_WRAPPER) + + set(AUDIOMAN_SRCS_CXX src/main.cpp src/CAmCommandReceiver.cpp @@ -102,8 +106,9 @@ if(WITH_DBUS_WRAPPER) endif(WITH_DBUS_WRAPPER) if(WITH_CAPI_WRAPPER) + set(LINK_LIBRARIES -Wl,--as-needed CommonAPI) set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} "${AUDIOMANAGER_UTILITIES_SRC}/CAmCommonAPIWrapper.cpp") - set (AM_LINK_LIBS ${AM_LINK_LIBS} ${CommonAPI_LIBRARY}) + set (AM_LINK_LIBS ${AM_LINK_LIBS} ${LINK_LIBRARIES}) endif(WITH_CAPI_WRAPPER) if(WITH_DATABASE_STORAGE) @@ -130,9 +135,9 @@ INCLUDE_DIRECTORIES( ) if(WITH_CAPI_WRAPPER) - -INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} - ${COMMONAPI_INCLUDE_DIRS}) + INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} + ${COMMONAPI_INCLUDE_DIRS} + ) endif(WITH_CAPI_WRAPPER) if(WITH_DLT) |