summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Duponchelle <mathieu.duponchelle@opencreed.com>2016-10-25 19:44:41 +0200
committerChristian as GENIVI Maintainer <genivi-maint-audiomanager@genivi.org>2016-11-14 01:12:18 -0800
commitad257b5ae132799723ae81f35d82cc3b11e51c54 (patch)
tree40dab12c86aeefb13e0f92b5e2032f22081d05ef
parentd697db3290b4c95d44487477088ecc3829e2791f (diff)
downloadaudiomanager-ad257b5ae132799723ae81f35d82cc3b11e51c54.tar.gz
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.
-rw-r--r--AudioManagerUtilities/CMakeLists.txt4
-rw-r--r--AudioManagerUtilities/include/CAmDltWrapper.h2
-rw-r--r--cmake/AudioManagerUtilitiesConfig.cmake.in2
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 <dlt/dlt.h>
+ #include <dlt.h>
#else
#include <stdint.h>
#include <sstream>
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})