diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-04-03 16:26:42 +0200 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-04-03 16:26:42 +0200 |
| commit | 2a10a4e177bade0c55ac94d82aff00f6993cfa91 (patch) | |
| tree | 13cf85f7c17f326960856de542aec1b627848ea3 /PluginCommandInterfaceDbus | |
| parent | 080c47ed68134f5665ffe72c0787b7ac84085e23 (diff) | |
| download | audiomanager-2a10a4e177bade0c55ac94d82aff00f6993cfa91.tar.gz | |
* [GAM-56] fix
Signed-off-by: christian mueller <christian.ei.mueller@bmw.de>
Diffstat (limited to 'PluginCommandInterfaceDbus')
| -rw-r--r-- | PluginCommandInterfaceDbus/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | PluginCommandInterfaceDbus/test/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt index 57d10a4..9d7f8a7 100644 --- 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 --- 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" |