diff options
| author | Mathieu Duponchelle <mathieu.duponchelle@opencreed.com> | 2016-10-25 21:13:39 +0200 |
|---|---|---|
| committer | Christian as GENIVI Maintainer <genivi-maint-audiomanager@genivi.org> | 2016-11-14 01:12:24 -0800 |
| commit | fcbee1b981b9f53430f03d414f6e17d489453fe6 (patch) | |
| tree | 38db1aa0524e0b4c8e0bbb419ff435537e7faff1 /AudioManagerCore | |
| parent | ad257b5ae132799723ae81f35d82cc3b11e51c54 (diff) | |
| download | audiomanager-fcbee1b981b9f53430f03d414f6e17d489453fe6.tar.gz | |
AudioManagerUtilities: use LINK_DIRECTORIES
The -L flags were not retrieved from pkg_check_modules, except
for automotive-dlt, where LDFLAGS was added to the LIBS variable,
which was then passed to TARGET_LINK_LIBRARIES.
This led to compile-time errors when compiling in a custom
prefix.
We also propagate the LIB_DIRECTORIES and use them in
AmControlInterfaceTest and AudioManagerDaemon.
Diffstat (limited to 'AudioManagerCore')
| -rw-r--r-- | AudioManagerCore/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/AudioManagerCore/CMakeLists.txt b/AudioManagerCore/CMakeLists.txt index e47cb74..464a934 100644 --- a/AudioManagerCore/CMakeLists.txt +++ b/AudioManagerCore/CMakeLists.txt @@ -31,6 +31,10 @@ SET(AUDIO_MANAGER_CORE_LIBS AudioManagerUtilities CACHE INTERNAL "AUDIO_MANAGER_CORE_LIBS libs" FORCE) +SET(AUDIO_MANAGER_CORE_LIB_DIRECTORIES + ${AUDIOMANAGER_UTILITIES_LIB_DIRECTORIES} + CACHE INTERNAL "AUDIO_MANAGER_CORE_LIB_DIRECTORIES directories" FORCE) + IF (WITH_SHARED_CORE) SET(LIBRARY_TYPE SHARED) ELSE (WITH_SHARED_CORE) @@ -59,6 +63,8 @@ endif(WITH_TELNET) INCLUDE_DIRECTORIES(${AUDIOMANAGER_CORE_INCLUDE}) +LINK_DIRECTORIES(${AUDIO_MANAGER_CORE_LIB_DIRECTORIES}) + ADD_LIBRARY(AudioManagerCore ${LIBRARY_TYPE} ${AUDIOMAN_CORE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AudioManagerCore ${AUDIO_MANAGER_CORE_LIBS} ) diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt index 7660bbf..f2636a8 100644 --- a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt @@ -30,6 +30,8 @@ INCLUDE_DIRECTORIES( "*.cpp" ) +LINK_DIRECTORIES(${AUDIO_MANAGER_CORE_LIB_DIRECTORIES}) + add_executable(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmControlInterfaceTest |