diff options
Diffstat (limited to 'AudioManagerUtilities/CMakeLists.txt')
| -rw-r--r-- | AudioManagerUtilities/CMakeLists.txt | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/AudioManagerUtilities/CMakeLists.txt b/AudioManagerUtilities/CMakeLists.txt index f859026..55c97a6 100644 --- a/AudioManagerUtilities/CMakeLists.txt +++ b/AudioManagerUtilities/CMakeLists.txt @@ -21,12 +21,7 @@ PROJECT(AudioManagerUtilities LANGUAGES CXX VERSION ${DAEMONVERSION}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -SET(AUDIOMANAGER_UTILITIES_INCLUDE - ${AUDIOMANAGER_UTILITIES}/include - ${AUDIO_INCLUDE_FOLDER} - ${TCLAP_INCLUDE_DIR} - ${AUDIOMANAGER_INCLUDE_FOLDER} - CACHE INTERNAL "AUDIOMANAGER_INCLUDE directories" FORCE) +SET(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE "") SET(AUDIO_MANAGER_UTILITIES_LIBS ${CMAKE_DL_LIBS} @@ -51,8 +46,8 @@ if(WITH_SYSTEMD_WATCHDOG) ${AUDIO_MANAGER_UTILITIES_LIBS} ${SYSTEMD_LIBRARIES} CACHE INTERNAL "AUDIO_MANAGER_UTILITIES_LIBS libs" FORCE) - set(AUDIOMANAGER_UTILITIES_INCLUDE - ${AUDIOMANAGER_UTILITIES_INCLUDE} + set(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE + ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} ${SYSTEMD_INCLUDEDIR}) set (AUDIO_MANAGER_UTILITIES_SRCS_CXX ${AUDIO_MANAGER_UTILITIES_SRCS_CXX} @@ -63,10 +58,9 @@ endif(WITH_SYSTEMD_WATCHDOG) IF (WITH_DBUS_WRAPPER) pkg_check_modules (DBUS REQUIRED "dbus-1 >= 1.4") - set(AUDIOMANAGER_UTILITIES_INCLUDE - ${AUDIOMANAGER_UTILITIES_INCLUDE} - ${DBUS_INCLUDE_DIRS} - CACHE INTERNAL "AUDIOMANAGER_INCLUDE directories" FORCE) + set(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE + ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} + ${DBUS_INCLUDE_DIRS}) set (AUDIO_MANAGER_UTILITIES_LIBS ${AUDIO_MANAGER_UTILITIES_LIBS} @@ -91,14 +85,13 @@ IF (WITH_CAPI_WRAPPER) ${AUDIO_MANAGER_UTILITIES_SRCS_CXX} src/CAmCommonAPIWrapper.cpp) - set(AUDIOMANAGER_UTILITIES_INCLUDE - ${AUDIOMANAGER_UTILITIES_INCLUDE} - ${COMMONAPI_INCLUDE_DIRS} - CACHE INTERNAL "AUDIOMANAGER_INCLUDE directories" FORCE) + set(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE + ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} + ${COMMONAPI_INCLUDE_DIRS}) ENDIF (WITH_CAPI_WRAPPER) if(WITH_DLT) - pkg_check_modules(DLT REQUIRED "automotive-dlt >= 2.2.0") + pkg_check_modules(DLT REQUIRED "automotive-dlt >= 2.2.0") add_definitions(${DLT_CFLAGS_OTHER}) @@ -107,12 +100,21 @@ if(WITH_DLT) ${DLT_LIBRARIES} CACHE INTERNAL "AUDIO_MANAGER_UTILITIES_LIBS libs" FORCE) - SET(AUDIOMANAGER_UTILITIES_INCLUDE - ${AUDIOMANAGER_UTILITIES_INCLUDE} - ${DLT_LIBRARY_DIRS} - CACHE INTERNAL "AUDIOMANAGER_INCLUDE directories" FORCE) + SET(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE + ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} + ${DLT_LIBRARY_DIRS}) endif(WITH_DLT) +SET(AUDIOMANAGER_UTILITIES_INCLUDE + ${AUDIOMANAGER_UTILITIES}/include + ${AUDIO_INCLUDE_FOLDER} + ${TCLAP_INCLUDE_DIR} + ${AUDIOMANAGER_INCLUDE_FOLDER} + ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} + CACHE INTERNAL "AUDIOMANAGER_INCLUDE directories" FORCE) + + +message (STATUS "bla ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE}") INCLUDE_DIRECTORIES(${AUDIOMANAGER_UTILITIES_INCLUDE}) |