diff options
Diffstat (limited to 'AudioManagerDaemon/CMakeLists.txt')
| -rw-r--r-- | AudioManagerDaemon/CMakeLists.txt | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index 58c5929..b52e625 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -45,12 +45,13 @@ if (WITH_SYSTEMD_WATCHDOG) endif(SYSTEMD_FOUND) endif (WITH_SYSTEMD_WATCHDOG) -if(WITH_DBUS_WRAPPER) +if(WITH_DBUS_WRAPPER) find_package(DBUS REQUIRED) endif(WITH_DBUS_WRAPPER) if(WITH_CAPI_WRAPPER) - find_package(CommonAPI REQUIRED) + INCLUDE (CommonAPI) + LOAD_COMMONAPI(DBUS) endif(WITH_CAPI_WRAPPER) set (AM_LINK_LIBS @@ -103,15 +104,18 @@ if(WITH_DBUS_WRAPPER) ${DBUS_LIBRARY}) endif(WITH_DBUS_WRAPPER) +set (AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DBUS_LIBRARY}) + if(WITH_CAPI_WRAPPER) set (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} "${AUDIOMANAGER_UTILITIES_SRC}/CAmCommonAPIWrapper.cpp") set (AM_LINK_LIBS - ${AM_LINK_LIBS} - ${DBUS_LIBRARY} - ${COMMON_API_LIBRARIES} - ${COMMON_API_DBUS_LIBRARIES}) + ${AM_LINK_LIBS} + ${CommonAPI-DBus_LIBRARY} + ${CommonAPI_LIBRARY}) endif(WITH_CAPI_WRAPPER) if(WITH_NSM) @@ -151,24 +155,22 @@ INCLUDE_DIRECTORIES( ) if(WITH_CAPI_WRAPPER) - if(WITH_NSM) - include (CommonAPIGenerator) COMMON_API_GENERATE_SOUCRES(TARGET COMMON_API - FIDLS fidls/NodeStateManager.fidl # a list with fidls - DESTINATION src-gen # a relative path to the build directory or an absolute path + FIDLS fidls/NodeStateManager.fdepl # a list with fidls + DESTINATION src-gen # a relative path to the build directory or an absolute path ALT_DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/src-gen # an alternative relative/absolute path with common-api sources, usually in the source tree - DBUS) + ) + set(AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} ${COMMON_API_GEN_SOURCES}) endif(WITH_NSM) INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} - ${COMMON_API_INCLUDE_DIRS} - ${COMMON_API_DBUS_INCLUDE_DIRS} - ${COMMON_API_GEN_INCLUDE_DIR}) - + ${COMMONAPI_DBUS_INCLUDE_DIRS} + ${COMMONAPI_INCLUDE_DIRS} + ${COMMON_API_GEN_INCLUDE_DIR}) endif(WITH_CAPI_WRAPPER) if(WITH_DLT) @@ -179,11 +181,11 @@ if(WITH_DLT) ${DLT_LIBRARIES}) endif(WITH_DLT) -if(WITH_DBUS_WRAPPER) +#if(WITH_DBUS_WRAPPER) INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} ${DBUS_ARCH_INCLUDE_DIR} ${DBUS_INCLUDE_DIR}) -endif(WITH_DBUS_WRAPPER) +#endif(WITH_DBUS_WRAPPER) ADD_EXECUTABLE(AudioManager ${AUDIOMAN_SRCS_CXX}) |