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 | |
parent | 036fa34dee2480530366230e4fdf910f318e2f03 (diff) | |
download | audiomanager-e553e5bc869df63d2e8d3fa0c581b3798db9b439.tar.gz |
* unfortunatly changed AUDIO_include_FOLDER back to AUDIO_INCLUDE_FOLDER
-rw-r--r-- | AudioManagerDaemon/CMakeLists.txt | 4 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt | 4 | ||||
-rw-r--r-- | AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt | 4 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | PluginCommandInterfaceDbus/CMakeLists.txt | 4 | ||||
-rw-r--r-- | PluginCommandInterfaceDbus/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PluginControlInterface/CMakeLists.txt | 4 | ||||
-rw-r--r-- | PluginControlInterface/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PluginRoutingInterfaceAsync/CMakeLists.txt | 4 | ||||
-rw-r--r-- | PluginRoutingInterfaceAsync/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PluginRoutingInterfaceDbus/CMakeLists.txt | 4 |
15 files changed, 22 insertions, 22 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} diff --git a/CMakeLists.txt b/CMakeLists.txt index 6116d2b..5072274 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,7 @@ else(USE_BUILD_LIBS) endif(USE_BUILD_LIBS) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) -SET(AUDIO_include_FOLDER ${CMAKE_SOURCE_DIR}/include) +SET(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/include) SET(DOC_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/doc) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin) SET(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/test) diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt index e0ad671..afba8d6 100644 --- a/PluginCommandInterfaceDbus/CMakeLists.txt +++ b/PluginCommandInterfaceDbus/CMakeLists.txt @@ -23,7 +23,7 @@ set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/command) set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/CommandDBusPlugin) set(include_FOLDER "include") -FILE(READ "${AUDIO_include_FOLDER}/command/IAmCommandSend.h" VERSION_BUFFER LIMIT 6000) +FILE(READ "${AUDIO_INCLUDE_FOLDER}/command/IAmCommandSend.h" VERSION_BUFFER LIMIT 6000) STRING(REGEX MATCH "CommandSendVersion*.[^0-9]*[0-9].[0-9]*[0-9]" LIB_INTERFACE_VERSION_STRING ${VERSION_BUFFER}) STRING(REGEX REPLACE "CommandSendVersion*.." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING}) MESSAGE(STATUS "Building against command interface version ${LIB_INTERFACE_VERSION}") @@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${DLT_INCLUDE_DIRS} ${include_FOLDER} ) diff --git a/PluginCommandInterfaceDbus/test/CMakeLists.txt b/PluginCommandInterfaceDbus/test/CMakeLists.txt index 8d8f971..4bd66fd 100644 --- a/PluginCommandInterfaceDbus/test/CMakeLists.txt +++ b/PluginCommandInterfaceDbus/test/CMakeLists.txt @@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES( ${STD_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${DBUS_ARCH_INCLUDE_DIR} ${DBUS_include_FOLDER} ${CMAKE_SOURCE_DIR} diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt index 480594f..cd94d7f 100644 --- a/PluginControlInterface/CMakeLists.txt +++ b/PluginControlInterface/CMakeLists.txt @@ -23,7 +23,7 @@ set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/control) set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/ControlPlugin) set(include_FOLDER "include") -FILE(READ "${AUDIO_include_FOLDER}/control/IAmControlSend.h" VERSION_BUFFER LIMIT 6000) +FILE(READ "${AUDIO_INCLUDE_FOLDER}/control/IAmControlSend.h" VERSION_BUFFER LIMIT 6000) STRING(REGEX MATCH "ControlSendVersion*.[^0-9]*[0-9].[0-9]*[0-9]" LIB_INTERFACE_VERSION_STRING ${VERSION_BUFFER}) STRING(REGEX REPLACE "ControlSendVersion*.." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING}) MESSAGE(STATUS "Building against control interface version ${LIB_INTERFACE_VERSION}") @@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${include_FOLDER} ) diff --git a/PluginControlInterface/test/CMakeLists.txt b/PluginControlInterface/test/CMakeLists.txt index b64e1c1..87628ba 100644 --- a/PluginControlInterface/test/CMakeLists.txt +++ b/PluginControlInterface/test/CMakeLists.txt @@ -29,7 +29,7 @@ INCLUDE_DIRECTORIES( ${STD_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} ${DLT_INCLUDE_DIRS} ${include_FOLDER} diff --git a/PluginRoutingInterfaceAsync/CMakeLists.txt b/PluginRoutingInterfaceAsync/CMakeLists.txt index b655a42..62a8530 100644 --- a/PluginRoutingInterfaceAsync/CMakeLists.txt +++ b/PluginRoutingInterfaceAsync/CMakeLists.txt @@ -22,7 +22,7 @@ set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/routing) set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/RoutingAsync) set(include_FOLDER "include") -FILE(READ "${AUDIO_include_FOLDER}/routing/IAmRoutingSend.h" VERSION_BUFFER LIMIT 6000) +FILE(READ "${AUDIO_INCLUDE_FOLDER}/routing/IAmRoutingSend.h" VERSION_BUFFER LIMIT 6000) STRING(REGEX MATCH "RoutingSendVersion*.[^0-9]*[0-9].[0-9]*[0-9]" LIB_INTERFACE_VERSION_STRING ${VERSION_BUFFER}) STRING(REGEX REPLACE "RoutingSendVersion*.." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING}) MESSAGE(STATUS "Building against routing interface version ${LIB_INTERFACE_VERSION}") @@ -33,7 +33,7 @@ FIND_PACKAGE(DBUS REQUIRED) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${include_FOLDER} ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR} diff --git a/PluginRoutingInterfaceAsync/test/CMakeLists.txt b/PluginRoutingInterfaceAsync/test/CMakeLists.txt index f64a3af..3357a4a 100644 --- a/PluginRoutingInterfaceAsync/test/CMakeLists.txt +++ b/PluginRoutingInterfaceAsync/test/CMakeLists.txt @@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES( ${STD_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} ${DLT_INCLUDE_DIRS} ${include_FOLDER} diff --git a/PluginRoutingInterfaceDbus/CMakeLists.txt b/PluginRoutingInterfaceDbus/CMakeLists.txt index 40f4fe3..d9af46c 100644 --- a/PluginRoutingInterfaceDbus/CMakeLists.txt +++ b/PluginRoutingInterfaceDbus/CMakeLists.txt @@ -22,7 +22,7 @@ set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/routing) set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/RoutingPlugin) set(include_FOLDER "include") -FILE(READ "${AUDIO_include_FOLDER}/routing/IAmRoutingSend.h" VERSION_BUFFER LIMIT 6000) +FILE(READ "${AUDIO_INCLUDE_FOLDER}/routing/IAmRoutingSend.h" VERSION_BUFFER LIMIT 6000) STRING(REGEX MATCH "RoutingSendVersion*.[^0-9]*[0-9].[0-9]*[0-9]" LIB_INTERFACE_VERSION_STRING ${VERSION_BUFFER}) STRING(REGEX REPLACE "RoutingSendVersion*.." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING}) MESSAGE(STATUS "Building against routing interface version ${LIB_INTERFACE_VERSION}") @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR} - ${AUDIO_include_FOLDER} + ${AUDIO_INCLUDE_FOLDER} ${include_FOLDER} ) |