* [GAM-56] fix

Signed-off-by: christian mueller <christian.ei.mueller@bmw.de>

diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt
index 2d4a450..4620db4 100644 (file)
--- a/AudioManagerDaemon/CMakeLists.txt
+++ b/AudioManagerDaemon/CMakeLists.txt
@@ -23,7 +23,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
 
 set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/AudioManager)
-set(include_FOLDER "include")
+set(INCLUDE_FOLDER "include")
 
 pkg_check_modules(SQLITE REQUIRED sqlite3)
 
@@ -66,7 +66,8 @@ INCLUDE_DIRECTORIES(
        ${CMAKE_SOURCE_DIR} 
        ${CMAKE_CURRENT_BINARY_DIR}     
        ${AUDIO_INCLUDE_FOLDER}
-       ${include_FOLDER}
+       ${PROJECT_INCLUDE_FOLDER}
+       ${INCLUDE_FOLDER}
 )
 
 IF(WITH_DLT)

diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt
index 936f969..b2a38da 100644 (file)
--- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt
@@ -29,13 +29,13 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${AUDIO_INCLUDE_FOLDER}
     ${DBUS_ARCH_INCLUDE_DIR}
-    ${DBUS_include_FOLDER} 
+    ${DBUS_INCLUDE_FOLDER} 
     ${CMAKE_SOURCE_DIR} 
     ${STD_INCLUDE_DIRS}
     ${DLT_INCLUDE_DIRS}
     ${DBUS_INCLUDE_DIR}
     ${GTEST_INCLUDE_DIR}
-    ${include_FOLDER}
+    ${INCLUDE_FOLDER}
 )
    
 file(GLOB CONTROL_INTERFACE_SRCS_CXX 

diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
index 2cfdfeb..305ed03 100644 (file)
--- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
@@ -29,12 +29,12 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${AUDIO_INCLUDE_FOLDER}
     ${DBUS_ARCH_INCLUDE_DIR}
-    ${DBUS_include_FOLDER} 
+    ${DBUS_INCLUDE_FOLDER} 
     ${CMAKE_SOURCE_DIR} 
     ${STD_INCLUDE_DIRS}
     ${DLT_INCLUDE_DIRS}
     ${DBUS_INCLUDE_DIR}
-    ${include_FOLDER}
+    ${INCLUDE_FOLDER}
 )
 
 file(GLOB DATABASE_SRCS_CXX 

diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt
index f9f6c39..e734366 100644 (file)
--- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt
@@ -29,12 +29,12 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${AUDIO_INCLUDE_FOLDER}
     ${DBUS_ARCH_INCLUDE_DIR}
-    ${DBUS_include_FOLDER} 
+    ${DBUS_INCLUDE_FOLDER} 
     ${CMAKE_SOURCE_DIR} 
     ${STD_INCLUDE_DIRS}
     ${DLT_INCLUDE_DIRS}
     ${DBUS_INCLUDE_DIR}
-    ${include_FOLDER}
+    ${INCLUDE_FOLDER}
 )
 
 file(GLOB ROUTING_SRCS_CXX 

diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
index e4ba858..6915a23 100644 (file)
--- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
@@ -30,12 +30,12 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${AUDIO_INCLUDE_FOLDER}
     ${DBUS_ARCH_INCLUDE_DIR}
-    ${DBUS_include_FOLDER} 
+    ${DBUS_INCLUDE_FOLDER} 
     ${CMAKE_SOURCE_DIR} 
     ${STD_INCLUDE_DIRS}
     ${DLT_INCLUDE_DIRS}
     ${DBUS_INCLUDE_DIR}
-    ${include_FOLDER}
+    ${INCLUDE_FOLDER}
 )
    
 file(GLOB ROUTING_INTERFACE_SRCS_CXX 

diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt
index 92f117e..79ed13e 100644 (file)
--- a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt
@@ -25,8 +25,8 @@ 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(DBUS_include_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude)
-set(include_FOLDER ${CMAKE_SOURCE_DIR}/../../include)
+set(DBUS_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude)
+set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include)
 
 
 FIND_PACKAGE(PkgConfig)
@@ -36,12 +36,12 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${AUDIO_INCLUDE_FOLDER}
     ${DBUS_ARCH_INCLUDE_DIR}
-    ${DBUS_include_FOLDER} 
+    ${DBUS_INCLUDE_FOLDER} 
     ${CMAKE_SOURCE_DIR} 
     ${STD_INCLUDE_DIRS}
     ${DLT_INCLUDE_DIRS}
     ${DBUS_INCLUDE_DIR}
-    ${include_FOLDER}
+    ${INCLUDE_FOLDER}
 )
    
 file(GLOB Socket_SRCS_CXX 

diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
index bcb9d9f..e5cc2fe 100644 (file)
--- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
@@ -25,8 +25,8 @@ 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(DBUS_include_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude)
-set(include_FOLDER ${CMAKE_SOURCE_DIR}/../../include)
+set(DBUS_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude)
+set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include)
 
 
 FIND_PACKAGE(PkgConfig)
@@ -36,13 +36,13 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${AUDIO_INCLUDE_FOLDER}
     ${DBUS_ARCH_INCLUDE_DIR}
-    ${DBUS_include_FOLDER} 
+    ${DBUS_INCLUDE_FOLDER} 
     ${CMAKE_SOURCE_DIR} 
     ${STD_INCLUDE_DIRS}
     ${DLT_INCLUDE_DIRS}
     ${DBUS_INCLUDE_DIR}
     ${GTEST_INCLUDE_DIR}
-    ${include_FOLDER}
+    ${INCLUDE_FOLDER}
 )
  
 file(GLOB TELNET_SRCS_CXX 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6485dcd..48cce3a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,7 @@ endif(USE_BUILD_LIBS)
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 SET(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/include)
+SET(PROJECT_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/ProjectSpecific/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)
@@ -151,6 +152,8 @@ if(WITH_MAIN)
        add_subdirectory (AudioManagerDaemon)
 endif(WITH_MAIN)
 
+add_subdirectory (ProjectSpecific)
+
 # uninstall target
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"

diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt
index 57d10a4..9d7f8a7 100644 (file)
--- a/PluginCommandInterfaceDbus/CMakeLists.txt
+++ b/PluginCommandInterfaceDbus/CMakeLists.txt
@@ -20,7 +20,7 @@ PROJECT(PluginCommandInterfaceDbus)
 
 set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/command)
 set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/CommandDBusPlugin)
-set(include_FOLDER "include")
+set(INCLUDE_FOLDER "include")
 
 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})
@@ -35,8 +35,9 @@ INCLUDE_DIRECTORIES(
        ${DBUS_INCLUDE_DIR}
        ${DBUS_ARCH_INCLUDE_DIR}
        ${AUDIO_INCLUDE_FOLDER}
+       ${PROJECT_INCLUDE_FOLDER}
        ${DLT_INCLUDE_DIRS}
-       ${include_FOLDER}
+       ${INCLUDE_FOLDER}
 )
 
 # all source files go here
@@ -72,7 +73,7 @@ INSTALL(TARGETS PluginCommandInterfaceDbus
         COMPONENT sampleplugins
 )
 
-execute_process(COMMAND cp "${CMAKE_SOURCE_DIR}/PluginCommandInterfaceDbus/${include_FOLDER}/CommandInterface.xml" ${EXECUTABLE_OUTPUT_PATH}/CommandInterface.xml)
+execute_process(COMMAND cp "${CMAKE_SOURCE_DIR}/PluginCommandInterfaceDbus/${INCLUDE_FOLDER}/CommandInterface.xml" ${EXECUTABLE_OUTPUT_PATH}/CommandInterface.xml)
 
 SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)")
 set_property(GLOBAL APPEND PROPERTY sampleplugins_prop "${ADD_DEPEND}")

diff --git a/PluginCommandInterfaceDbus/test/CMakeLists.txt b/PluginCommandInterfaceDbus/test/CMakeLists.txt
index 4bd66fd..08acb6b 100644 (file)
--- a/PluginCommandInterfaceDbus/test/CMakeLists.txt
+++ b/PluginCommandInterfaceDbus/test/CMakeLists.txt
@@ -37,11 +37,11 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${AUDIO_INCLUDE_FOLDER}
     ${DBUS_ARCH_INCLUDE_DIR}
-    ${DBUS_include_FOLDER} 
+    ${DBUS_INCLUDE_FOLDER} 
     ${CMAKE_SOURCE_DIR} 
     ${DLT_INCLUDE_DIRS}
     ${DBUS_INCLUDE_DIR}
-    ${include_FOLDER}
+    ${INCLUDE_FOLDER}
     ${PYTHON_INCLUDE_DIRS}
     ${GTEST_INCLUDE_DIR}
     "../../AudioManagerDaemon/include"

diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt
index fc88760..b1be2d1 100644 (file)
--- a/PluginControlInterface/CMakeLists.txt
+++ b/PluginControlInterface/CMakeLists.txt
@@ -20,7 +20,7 @@ PROJECT(PluginControlInterface)
 
 set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/control)
 set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/ControlPlugin)
-set(include_FOLDER "include")
+set(INCLUDE_FOLDER "include")
 
 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})
@@ -32,7 +32,8 @@ INCLUDE_DIRECTORIES(
        ${STD_INCLUDE_DIRS}
        ${CMAKE_CURRENT_BINARY_DIR}
        ${AUDIO_INCLUDE_FOLDER}
-       ${include_FOLDER}
+       ${PROJECT_INCLUDE_FOLDER}
+       ${INCLUDE_FOLDER}
 )
 
 # all source files go here

diff --git a/PluginControlInterface/test/CMakeLists.txt b/PluginControlInterface/test/CMakeLists.txt
index 87628ba..8b5fb88 100644 (file)
--- a/PluginControlInterface/test/CMakeLists.txt
+++ b/PluginControlInterface/test/CMakeLists.txt
@@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES(
     ${AUDIO_INCLUDE_FOLDER}
     ${CMAKE_SOURCE_DIR} 
     ${DLT_INCLUDE_DIRS}
-    ${include_FOLDER}
+    ${INCLUDE_FOLDER}
     ${GTEST_INCLUDE_DIR}
     ${DBUS_INCLUDE_DIR}
     ${DBUS_ARCH_INCLUDE_DIR}

diff --git a/PluginRoutingInterfaceAsync/CMakeLists.txt b/PluginRoutingInterfaceAsync/CMakeLists.txt
index ca1e467..e3e52f7 100644 (file)
--- a/PluginRoutingInterfaceAsync/CMakeLists.txt
+++ b/PluginRoutingInterfaceAsync/CMakeLists.txt
@@ -19,7 +19,7 @@ PROJECT(PluginRoutingInterfaceAsync)
 
 set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/routing)
 set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/RoutingAsync)
-set(include_FOLDER "include")
+set(INCLUDE_FOLDER "include")
 
 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})
@@ -33,7 +33,8 @@ INCLUDE_DIRECTORIES(
        ${CMAKE_SOURCE_DIR} 
        ${CMAKE_CURRENT_BINARY_DIR}
        ${AUDIO_INCLUDE_FOLDER}
-       ${include_FOLDER}
+       ${PROJECT_INCLUDE_FOLDER}
+       ${INCLUDE_FOLDER}
        ${DBUS_INCLUDE_DIR}
     ${DBUS_ARCH_INCLUDE_DIR}
 )

diff --git a/PluginRoutingInterfaceAsync/test/CMakeLists.txt b/PluginRoutingInterfaceAsync/test/CMakeLists.txt
index 3357a4a..0fee078 100644 (file)
--- a/PluginRoutingInterfaceAsync/test/CMakeLists.txt
+++ b/PluginRoutingInterfaceAsync/test/CMakeLists.txt
@@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES(
     ${AUDIO_INCLUDE_FOLDER}
     ${CMAKE_SOURCE_DIR} 
     ${DLT_INCLUDE_DIRS}
-    ${include_FOLDER}
+    ${INCLUDE_FOLDER}
     ${GTEST_INCLUDE_DIR}
     ${DBUS_INCLUDE_DIR}
     ${DBUS_ARCH_INCLUDE_DIR}

diff --git a/PluginRoutingInterfaceDbus/CMakeLists.txt b/PluginRoutingInterfaceDbus/CMakeLists.txt
index d9af46c..5781bf9 100644 (file)
--- a/PluginRoutingInterfaceDbus/CMakeLists.txt
+++ b/PluginRoutingInterfaceDbus/CMakeLists.txt
@@ -20,7 +20,7 @@ PROJECT(PluginRoutingInterfaceDbus)
 
 set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/routing)
 set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/RoutingPlugin)
-set(include_FOLDER "include")
+set(INCLUDE_FOLDER "include")
 
 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})
@@ -35,7 +35,8 @@ INCLUDE_DIRECTORIES(
        ${DBUS_INCLUDE_DIR}
        ${DBUS_ARCH_INCLUDE_DIR}
        ${AUDIO_INCLUDE_FOLDER}
-       ${include_FOLDER}
+       ${PROJECT_INCLUDE_FOLDER}
+       ${INCLUDE_FOLDER}
 )
 
 # all source files go here