From ad257b5ae132799723ae81f35d82cc3b11e51c54 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Tue, 25 Oct 2016 19:44:41 +0200 Subject: AudioManagerUtilities: fix dlt cmake integration The wrong variables from pkg_check_modules were used, effectively forcing the inclusion of dlt.h to happen from /include. Fix this to take advantage of pkg-config and allow building against a non-system-wide dlt-daemon. --- AudioManagerUtilities/CMakeLists.txt | 4 ++-- AudioManagerUtilities/include/CAmDltWrapper.h | 2 +- cmake/AudioManagerUtilitiesConfig.cmake.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AudioManagerUtilities/CMakeLists.txt b/AudioManagerUtilities/CMakeLists.txt index 98abc69..ea3f142 100644 --- a/AudioManagerUtilities/CMakeLists.txt +++ b/AudioManagerUtilities/CMakeLists.txt @@ -97,12 +97,12 @@ if(WITH_DLT) set(AUDIO_MANAGER_UTILITIES_LIBS ${AUDIO_MANAGER_UTILITIES_LIBS} - ${DLT_LDFLAGS} + ${DLT_LDFLAGS} CACHE INTERNAL "AUDIO_MANAGER_UTILITIES_LIBS libs" FORCE) SET(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} - ${DLT_LIBRARY_DIRS}) + ${DLT_INCLUDE_DIRS}) endif(WITH_DLT) SET(AUDIOMANAGER_UTILITIES_INCLUDE diff --git a/AudioManagerUtilities/include/CAmDltWrapper.h b/AudioManagerUtilities/include/CAmDltWrapper.h index dc5ec64..8c2b514 100644 --- a/AudioManagerUtilities/include/CAmDltWrapper.h +++ b/AudioManagerUtilities/include/CAmDltWrapper.h @@ -29,7 +29,7 @@ #include "audiomanagertypes.h" #ifdef WITH_DLT - #include + #include #else #include #include diff --git a/cmake/AudioManagerUtilitiesConfig.cmake.in b/cmake/AudioManagerUtilitiesConfig.cmake.in index b13fac4..471ddd6 100644 --- a/cmake/AudioManagerUtilitiesConfig.cmake.in +++ b/cmake/AudioManagerUtilitiesConfig.cmake.in @@ -39,7 +39,7 @@ if(WITH_DLT) SET(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} - ${DLT_LIBRARY_DIRS}) + ${DLT_INCLUDE_DIRS}) endif(WITH_DLT) set(AudioManagerUtilities_INCLUDE_DIRS ${AudioManagerUtilities_INCLUDE_DIRS} ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE}) -- cgit v1.2.1