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/CMakeLists.txt | |
| 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/CMakeLists.txt')
| -rw-r--r-- | AudioManagerDaemon/CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 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) |