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 | |
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>
-rw-r--r-- | AudioManagerDaemon/CMakeLists.txt | 13 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt | 5 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt | 5 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt | 5 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt | 8 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt | 8 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt | 10 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt | 10 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt | 8 | ||||
-rw-r--r-- | AudioManagerUtilities/CMakeLists.txt | 95 | ||||
-rwxr-xr-x | CMakeLists.txt | 14 | ||||
-rwxr-xr-x | README | 3 | ||||
-rw-r--r-- | cmake/audiomanagerConfig.cmake.in | 1 |
13 files changed, 140 insertions, 45 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} diff --git a/AudioManagerUtilities/CMakeLists.txt b/AudioManagerUtilities/CMakeLists.txt new file mode 100644 index 0000000..78967a6 --- /dev/null +++ b/AudioManagerUtilities/CMakeLists.txt @@ -0,0 +1,95 @@ +# Copyright (C) 2015, ADIT GmbH +# +# This file is part of GENIVI Project AudioManager. +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# copyright +# This Source Code Form is subject to the terms of the +# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with +# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# author Jens Lorenz, jens.lorenz@de.adit-jv.com ADIT,2015 +# +# For further information see http://www.genivi.org/. +# + +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) + +PROJECT(AudioManagerUtilities) + +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") +SET(INCLUDE_FOLDER "include") + +INCLUDE_DIRECTORIES( + ${INCLUDE_FOLDER} + ${AUDIO_INCLUDE_FOLDER} + ${AUDIOMANAGER_INCLUDE_FOLDER} + ${DBUS_INCLUDE_DIR} + ${DBUS_ARCH_INCLUDE_DIR} + ${TCLAP_INCLUDE_DIR} +) + +IF (WITH_SHARED_UTILITIES) + SET(LIBRARY_TYPE SHARED) +ELSE (WITH_SHARED_UTILITIES) + SET(LIBRARY_TYPE STATIC) +ENDIF (WITH_SHARED_UTILITIES) + +SET(AUDIO_MANAGER_UTILITIES_SRCS_CXX + src/CAmCommandLineSingleton.cpp + src/CAmDltWrapper.cpp + src/CAmSocketHandler.cpp) + +IF (WITH_DBUS_WRAPPER) + FIND_PACKAGE(DBUS REQUIRED) +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}) + SET(AUDIO_MANAGER_UTILITIES_SRCS_CXX + ${AUDIO_MANAGER_UTILITIES_SRCS_CXX} + src/CAmDbusWrapper.cpp) +ENDIF (WITH_DBUS_WRAPPER) + +IF (WITH_CAPI_WRAPPER) + SET(AM_LINK_LIBS + ${AM_LINK_LIBS} + ${DBUS_LIBRARY} + ${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}) +ENDIF (WITH_CAPI_WRAPPER) + +ADD_LIBRARY(AudioManagerUtilities ${LIBRARY_TYPE} ${AUDIO_MANAGER_UTILITIES_SRCS_CXX}) + +TARGET_LINK_LIBRARIES(AudioManagerUtilities ${AM_LINK_LIBS}) + +IF (WITH_SHARED_UTILITIES) + INSTALL(TARGETS AudioManagerUtilities + LIBRARY DESTINATION lib + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ + COMPONENT bin) +ELSE (WITH_SHARED_UTILITIES) + INSTALL(TARGETS AudioManagerUtilities + ARCHIVE DESTINATION lib + COMPONENT dev) +ENDIF (WITH_SHARED_UTILITIES) + +INSTALL(DIRECTORY "${AUDIOMANAGER_UTILITIES_INCLUDE}/" + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX} + COMPONENT dev) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12b1da0..c5ef194 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,14 +58,17 @@ option ( USE_BUILD_LIBS option ( GLIB_DBUS_TYPES_TOLERANT "Build dbus with tolerance towards glib 16bit/32bit handling" ON) -option ( WITH_DATABASE_STORAGE - "Build with sqlite as in memory storage" OFF) - option ( WITH_CAPI_WRAPPER "Build with commonapi wrapper" ON) option ( WITH_DBUS_WRAPPER "Build with Dbus wrapper" OFF) + +option ( WITH_SHARED_UTILITIES + "Build audio manager utilities as dynamic library" OFF) + +option ( WITH_DATABASE_STORAGE + "Build with sqlite as in memory storage" OFF) set(DBUS_SERVICE_PREFIX "org.genivi.audiomanager" CACHE PROPERTY "The dbus service prefix for the AM - only changable for legacy dbus") @@ -101,8 +104,8 @@ set(DOC_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/doc CACHE STRINGS "The doxygen documentation will be placed here") set(AM_SHARE_FOLDER ${CMAKE_INSTALL_PREFIX}/share/audiomanager - CACHE STRINGS "The share folder for the AM. Some DBus xmls will be placed here and so on") - + CACHE STRINGS "The share folder for the AM. Some DBus xmls will be placed here and so on") + set(AUDIOMANAGER_INCLUDE_FOLDER ${CMAKE_BINARY_DIR}/include) set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/include) set(AUDIOMANAGER_UTILITIES ${CMAKE_SOURCE_DIR}/AudioManagerUtilities) @@ -177,6 +180,7 @@ write_basic_package_version_file( COMPATIBILITY SameMajorVersion ) add_subdirectory (AudioManagerDaemon) +add_subdirectory (AudioManagerUtilities) if(EXISTS "${CMAKE_SOURCE_DIR}/Plugins/") add_subdirectory (${CMAKE_SOURCE_DIR}/Plugins) @@ -95,7 +95,7 @@ These are the compile options with default values: WITH_DATABASE_STORAGE OFF WITH_DLT ON WITH_DOCUMENTATION OFF - WITH_ENABLED_IPC CAPI + WITH_SHARED_UTILITIES OFF WITH_SYSTEMD_WATCHDOG OFF WITH_TELNET ON WITH_TESTS ON @@ -130,6 +130,7 @@ sudo apt-get install libdbus-1-dev libsqlite3-dev doxygen git cmake build-essent === AudioManagerUtilities In the AudioManagerUtilites you can find helper functions that can be reused by other projects as well. +The library can be shipped as a static or a dynamic link library (WITH_SHARED_UTILITIES). === The NodeStateManager diff --git a/cmake/audiomanagerConfig.cmake.in b/cmake/audiomanagerConfig.cmake.in index febb496..4cff130 100644 --- a/cmake/audiomanagerConfig.cmake.in +++ b/cmake/audiomanagerConfig.cmake.in @@ -38,6 +38,7 @@ IF(WITH_TESTS) ENDIF(WITH_TESTS) check_required_components(AudioManagerDaemon) +check_required_components(AudioManagerUtilities) |