diff options
author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2015-09-15 14:32:18 +0200 |
---|---|---|
committer | Christian Linke <christian.linke@bmw.de> | 2015-10-06 19:28:39 +0100 |
commit | 276ec7d3e207f089cf9cd1dd375bf8508fc4cde3 (patch) | |
tree | 85168407994ee90d2aecbfd2c5f2ed6c379fea89 /AudioManagerDaemon | |
parent | af5b8d11ef93907ea9593fd61b56340f0a410ea2 (diff) | |
download | audiomanager-276ec7d3e207f089cf9cd1dd375bf8508fc4cde3.tar.gz |
Utilities now build as a static or as a shared library on demand.
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
Diffstat (limited to 'AudioManagerDaemon')
9 files changed, 33 insertions, 39 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index c08ca77..260483c 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -51,6 +51,7 @@ endif(WITH_DBUS_WRAPPER) set (AM_LINK_LIBS ${CMAKE_DL_LIBS} + AudioManagerUtilities rt) if(WITH_CAPI_WRAPPER) @@ -72,9 +73,7 @@ set(AUDIOMAN_SRCS_CXX src/CAmRoutingSender.cpp src/CAmRouter.cpp src/CAmLog.cpp - "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmCommandLineSingleton.cpp") +) if(WITH_TELNET) set (AUDIOMAN_SRCS_CXX @@ -157,7 +156,9 @@ ADD_EXECUTABLE(AudioManager ${AUDIOMAN_SRCS_CXX}) TARGET_LINK_LIBRARIES(AudioManager ${AM_LINK_LIBS}) -INSTALL(TARGETS AudioManager +ADD_DEPENDENCIES(AudioManager AudioManagerUtilities) + +INSTALL(TARGETS AudioManager RUNTIME DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT bin) @@ -166,10 +167,6 @@ INSTALL(DIRECTORY "${AUDIO_INCLUDE_FOLDER}/" DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX} COMPONENT dev) -INSTALL(DIRECTORY "${AUDIOMANAGER_UTILITIES_INCLUDE}/" - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX} - COMPONENT dev) - if(WITH_TESTS) add_subdirectory (test) endif(WITH_TESTS) diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt index 33a2f8b..44b3aef 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt @@ -23,6 +23,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManage set (AM_LINK_LIBS ${CMAKE_DL_LIBS} + AudioManagerUtilities rt) if(WITH_DATABASE_STORAGE) @@ -64,8 +65,6 @@ file(GLOB CONTROL_INTERFACE_SRCS_CXX "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" "../CAmCommonFunctions.cpp" "*.cpp" ) @@ -77,7 +76,7 @@ TARGET_LINK_LIBRARIES(AmControlInterfaceTest gtest gmock) -ADD_DEPENDENCIES(AmControlInterfaceTest gtest gmock) +ADD_DEPENDENCIES(AmControlInterfaceTest gtest gmock AudioManagerUtilities) INSTALL(TARGETS AmControlInterfaceTest DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt index 85741d8..88b1d81 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt @@ -26,6 +26,7 @@ if(WITH_DATABASE_STORAGE) set (AM_LINK_LIBS ${CMAKE_DL_LIBS} + AudioManagerUtilities rt) pkg_check_modules(SQLITE REQUIRED sqlite3) @@ -61,10 +62,8 @@ if(WITH_DATABASE_STORAGE) "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" "../CAmCommonFunctions.cpp" "*.cpp" ) @@ -81,7 +80,7 @@ if(WITH_DATABASE_STORAGE) gmock ) - ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest gmock) + ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest gmock AudioManagerUtilities) INSTALL(TARGETS AmDatabaseHandlerTest DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt index b4555e1..22bd598 100644 --- a/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt @@ -23,6 +23,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioMan set (AM_LINK_LIBS ${CMAKE_DL_LIBS} + AudioManagerUtilities rt) if(WITH_DLT) @@ -55,10 +56,8 @@ file(GLOB DATABASE_SRCS_CXX "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" "../CAmCommonFunctions.cpp" "CAmTestDatabaseObserver.cpp" "*.cpp" @@ -74,7 +73,7 @@ TARGET_LINK_LIBRARIES( AmMapHandlerTest gmock ) -ADD_DEPENDENCIES(AmMapHandlerTest gtest gmock) +ADD_DEPENDENCIES(AmMapHandlerTest gtest gmock AudioManagerUtilities) INSTALL(TARGETS AmMapHandlerTest DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt index e870e20..f538741 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt @@ -23,6 +23,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioMan set (AM_LINK_LIBS ${CMAKE_DL_LIBS} + AudioManagerUtilities rt) if(WITH_DLT) @@ -49,8 +50,6 @@ file(GLOB ROUTINGMAP_SRCS_CXX "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" "../CAmCommonFunctions.cpp" @@ -62,9 +61,10 @@ ADD_EXECUTABLE( AmRouterMapTest ${ROUTINGMAP_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmRouterMapTest ${AM_LINK_LIBS} gtest - gmock) + gmock +) -ADD_DEPENDENCIES(AmRouterMapTest gtest gmock) +ADD_DEPENDENCIES(AmRouterMapTest gtest gmock AudioManagerUtilities) INSTALL(TARGETS AmRouterMapTest DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt index b19f6f1..d4e2580 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt @@ -23,6 +23,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioMan set (AM_LINK_LIBS ${CMAKE_DL_LIBS} + AudioManagerUtilities rt) if(WITH_DLT) @@ -49,8 +50,6 @@ file(GLOB ROUTING_SRCS_CXX "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" "../CAmCommonFunctions.cpp" @@ -62,9 +61,10 @@ ADD_EXECUTABLE( AmRouterTest ${ROUTING_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmRouterTest ${AM_LINK_LIBS} gtest - gmock) + gmock +) -ADD_DEPENDENCIES(AmRouterTest gtest gmock) +ADD_DEPENDENCIES(AmRouterTest gtest gmock AudioManagerUtilities) INSTALL(TARGETS AmRouterTest DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt index 6294f7d..7c19a4b 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -25,6 +25,7 @@ find_package(PkgConfig) set (AM_LINK_LIBS ${CMAKE_DL_LIBS} + AudioManagerUtilities rt) if(WITH_DLT) @@ -57,9 +58,7 @@ file(GLOB ROUTING_INTERFACE_SRCS_CXX "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" - "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" + "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp" "../CAmCommonFunctions.cpp" @@ -71,9 +70,10 @@ ADD_EXECUTABLE(AmRoutingInterfaceTest ${ROUTING_INTERFACE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmRoutingInterfaceTest ${AM_LINK_LIBS} gtest - gmock) + gmock +) -ADD_DEPENDENCIES(AmRoutingInterfaceTest gtest gmock) +ADD_DEPENDENCIES(AmRoutingInterfaceTest gtest gmock AudioManagerUtilities) INSTALL(TARGETS AmRoutingInterfaceTest DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt index 8cd4197..bf197f4 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt @@ -23,6 +23,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioMan set (AM_LINK_LIBS ${CMAKE_DL_LIBS} + AudioManagerUtilities rt) if(WITH_DLT) @@ -49,9 +50,7 @@ if(WITH_DLT) ${DLT_INCLUDE_DIRS}) endif(WITH_DLT) -file(GLOB Socket_SRCS_CXX - "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" +file(GLOB Socket_SRCS_CXX "*.cpp" ) @@ -60,9 +59,10 @@ ADD_EXECUTABLE(AmSocketHandlerTest ${Socket_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmSocketHandlerTest ${AM_LINK_LIBS} gtest - gmock) + gmock +) -ADD_DEPENDENCIES(AmSocketHandlerTest gtest gmock) +ADD_DEPENDENCIES(AmSocketHandlerTest gtest gmock AudioManagerUtilities) INSTALL(TARGETS AmSocketHandlerTest DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index d613ed6..e7e7955 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -21,6 +21,7 @@ PROJECT(AmTelnetServerTest) set (AM_LINK_LIBS ${CMAKE_DL_LIBS} + AudioManagerUtilities rt) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") @@ -56,10 +57,8 @@ file(GLOB TELNET_SRCS_CXX "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmTelnetServer.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp" - "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmTelnetMenuHelper.cpp" "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerMap.cpp" "*.cpp" @@ -70,9 +69,10 @@ ADD_EXECUTABLE(AmTelnetServerTest ${TELNET_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmTelnetServerTest ${AM_LINK_LIBS} gtest - gmock) + gmock +) -ADD_DEPENDENCIES(AmTelnetServerTest gtest gmock) +ADD_DEPENDENCIES(AmTelnetServerTest gtest gmock AudioManagerUtilities) INSTALL(TARGETS AmTelnetServerTest DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} |