diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2012-03-06 16:39:11 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-03-06 16:39:11 +0100 |
commit | e553e5bc869df63d2e8d3fa0c581b3798db9b439 (patch) | |
tree | b516ea1b3534c9f2ed3cb427b303b8a1d3a0f6e6 /AudioManagerDaemon | |
parent | 036fa34dee2480530366230e4fdf910f318e2f03 (diff) | |
download | audiomanager-e553e5bc869df63d2e8d3fa0c581b3798db9b439.tar.gz |
* unfortunatly changed AUDIO_include_FOLDER back to AUDIO_INCLUDE_FOLDER
Diffstat (limited to 'AudioManagerDaemon')
7 files changed, 10 insertions, 10 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index e90afee..d787b34 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -66,7 +66,7 @@ ENDIF(WITH_SOCKETHANDLER_LOOP) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${include_FOLDER} ) @@ -122,7 +122,7 @@ INSTALL(TARGETS AudioManager COMPONENT bin ) -INSTALL(DIRECTORY "${AUDIO_include_FOLDER}/" +INSTALL(DIRECTORY "${AUDIO_INCLUDE_FOLDER}/" DESTINATION include COMPONENT dev ) diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt index fa5ad7c..55380e0 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt @@ -28,7 +28,7 @@ pkg_check_modules(DLT REQUIRED automotive-dlt) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${DBUS_ARCH_INCLUDE_DIR} ${DBUS_include_FOLDER} ${CMAKE_SOURCE_DIR} diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt index 6469e87..6fa2152 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt @@ -28,7 +28,7 @@ pkg_check_modules(DLT REQUIRED automotive-dlt) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${DBUS_ARCH_INCLUDE_DIR} ${DBUS_include_FOLDER} ${CMAKE_SOURCE_DIR} diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt index 117edd1..5960544 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt @@ -28,7 +28,7 @@ pkg_check_modules(DLT REQUIRED automotive-dlt) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${DBUS_ARCH_INCLUDE_DIR} ${DBUS_include_FOLDER} ${CMAKE_SOURCE_DIR} diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt index 1634bdf..857015f 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -29,7 +29,7 @@ pkg_check_modules(DLT REQUIRED automotive-dlt) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${DBUS_ARCH_INCLUDE_DIR} ${DBUS_include_FOLDER} ${CMAKE_SOURCE_DIR} diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt index a13883c..39b43d7 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt @@ -25,7 +25,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioMan set(STD_INCLUDE_DIRS "/usr/include") set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../../../dbusInterfaces) -set(AUDIO_include_FOLDER ${CMAKE_SOURCE_DIR}/../../../include) +set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../include) set(DBUS_include_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude) set(include_FOLDER ${CMAKE_SOURCE_DIR}/../../include) @@ -35,7 +35,7 @@ pkg_check_modules(DLT REQUIRED automotive-dlt) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${DBUS_ARCH_INCLUDE_DIR} ${DBUS_include_FOLDER} ${CMAKE_SOURCE_DIR} diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index dfa8952..eb392f4 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -25,7 +25,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioMan set(STD_INCLUDE_DIRS "/usr/include") set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../../../dbusInterfaces) -set(AUDIO_include_FOLDER ${CMAKE_SOURCE_DIR}/../../../include) +set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../include) set(DBUS_include_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude) set(include_FOLDER ${CMAKE_SOURCE_DIR}/../../include) @@ -35,7 +35,7 @@ pkg_check_modules(DLT REQUIRED automotive-dlt) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${DBUS_ARCH_INCLUDE_DIR} ${DBUS_include_FOLDER} ${CMAKE_SOURCE_DIR} |