diff options
| author | christian linke <christian.linke@bmw.de> | 2012-12-17 16:15:11 +0100 |
|---|---|---|
| committer | christian linke <christian.linke@bmw.de> | 2012-12-17 16:15:11 +0100 |
| commit | 54c5e965fe8f9a53a78834028fd65c792493da2b (patch) | |
| tree | 560d7b1209e6a8d4798de9568e4b4a947c2ab42a /AudioManagerDaemon/CMakeLists.txt | |
| parent | 215e8a72dc81e8a86dd5b3a8ca40fd2c7c6a0b9c (diff) | |
| download | audiomanager-54c5e965fe8f9a53a78834028fd65c792493da2b.tar.gz | |
* added new interfaces & nsm support + nsm tests + fixed some unit tests + fixed rundown
Signed-off-by: christian linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/CMakeLists.txt')
| -rw-r--r-- | AudioManagerDaemon/CMakeLists.txt | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index 2fa7343..4704864 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -69,6 +69,7 @@ IF(WITH_DBUS_WRAPPER) SET (AUDIOMAN_SRCS_CXX ${AUDIOMAN_SRCS_CXX} src/CAmDbusWrapper.cpp + src/CAmNodeStateCommunicator.cpp ) ENDIF(WITH_DBUS_WRAPPER) @@ -129,10 +130,6 @@ IF (SYSTEMD_FOUND) ) ENDIF (SYSTEMD_FOUND) -IF(WITH_TESTS) - add_subdirectory (test) -ENDIF(WITH_TESTS) - #IF(WITH_DOCUMENTATION) # file(MAKE_DIRECTORY ${DOC_OUTPUT_PATH}) # configure_file(${DOXY_FILE} ${DOC_OUTPUT_PATH}/Doxyfile @ONLY IMMEDIATE) @@ -154,6 +151,27 @@ INSTALL(DIRECTORY "${AUDIO_INCLUDE_FOLDER}/" COMPONENT dev ) +IF(WITH_DBUS_WRAPPER) + IF(USE_BUILD_LIBS) + SET(NSM_INTROSPECTION_FILE ${EXECUTABLE_OUTPUT_PATH}/LifeCycleConsumer.xml) + execute_process( + COMMAND mkdir -p "${CMAKE_SOURCE_DIR}/bin" + COMMAND cp "${CMAKE_SOURCE_DIR}/cmake/LifecycleConsumer.xml" ${NSM_INTROSPECTION_FILE}) + ELSE(USE_BUILD_LIBS) + SET(NSM_INTROSPECTION_FILE ${CMAKE_INSTALL_PREFIX}/share/audiomanager/LifeCycleConsumer.xml) + INSTALL( + FILES ${CMAKE_SOURCE_DIR}/cmake/LifecycleConsumer.xml + DESTINATION "${NSM_INTROSPECTION_FILE}" + COMPONENT bin) + ENDIF(USE_BUILD_LIBS) +ENDIF(WITH_DBUS_WRAPPER) + +CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/config.cmake ${CMAKE_SOURCE_DIR}/include/config.h ) + +IF(WITH_TESTS) + add_subdirectory (test) +ENDIF(WITH_TESTS) + # General packet dependency SET(ADD_DEPEND_BIN_PROP "sqlite3(>=3.6.22)") |