diff options
| author | Christian Mueller <christian@lmuc329619u.(none)> | 2011-12-16 12:29:27 +0100 |
|---|---|---|
| committer | Christian Mueller <christian@lmuc329619u.(none)> | 2011-12-16 12:29:27 +0100 |
| commit | 392d090c63dcb03df8a044abbc6cc84807e341e5 (patch) | |
| tree | 10ea0610a5a6d0e8c9ebbe01b6433fcd1c754ebf /PluginCommandInterfaceDbus | |
| parent | 281cb0d875832bb56c82bad3516fc4021f8be4b0 (diff) | |
| download | audiomanager-392d090c63dcb03df8a044abbc6cc84807e341e5.tar.gz | |
changes to make controlSender compile & loadable
Diffstat (limited to 'PluginCommandInterfaceDbus')
| -rw-r--r-- | PluginCommandInterfaceDbus/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | PluginCommandInterfaceDbus/include/DBusCommandSender.h (renamed from PluginCommandInterfaceDbus/include/CommandSender.h) | 6 | ||||
| -rw-r--r-- | PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp | 2 | ||||
| -rw-r--r-- | PluginCommandInterfaceDbus/src/DBusCommandSender.cpp (renamed from PluginCommandInterfaceDbus/src/CommandSender.cpp) | 2 | ||||
| -rw-r--r-- | PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt index 5a2877d..8926b33 100644 --- a/PluginCommandInterfaceDbus/CMakeLists.txt +++ b/PluginCommandInterfaceDbus/CMakeLists.txt @@ -16,7 +16,6 @@ set(AUDIO_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../includes) set(DBUS_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../dbusIncludes) set(INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/include) -find_package (Threads) FIND_PACKAGE(DBUS REQUIRED) FIND_PACKAGE(PkgConfig) pkg_check_modules(DLT REQUIRED automotive-dlt) @@ -43,11 +42,11 @@ file(GLOB PLUGINDBUS_SRCS_CXX "src/*.cpp") add_library(PluginCommandInterfaceDbus SHARED ${PLUGINDBUS_SRCS_CXX}) TARGET_LINK_LIBRARIES(PluginCommandInterfaceDbus - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} + ${DLT_LIBRARIES} + ${DBUS_LIBRARY} ) +add_subdirectory (test) #add a target to generate API documentation with Doxygen find_package(Doxygen) diff --git a/PluginCommandInterfaceDbus/include/CommandSender.h b/PluginCommandInterfaceDbus/include/DBusCommandSender.h index 88fb47e..724f412 100644 --- a/PluginCommandInterfaceDbus/include/CommandSender.h +++ b/PluginCommandInterfaceDbus/include/DBusCommandSender.h @@ -24,8 +24,8 @@ */ -#ifndef COMMANDSENDER_H_ -#define COMMANDSENDER_H_ +#ifndef DBUSCOMMANDSENDER_H_ +#define DBUSCOMMANDSENDER_H_ #include "DBusMessageHandler.h" #include "CommandReceiverShadow.h" @@ -105,4 +105,4 @@ private: }; -#endif /* COMMANDSENDER_H_ */ +#endif /* DBUSCOMMANDSENDER_H_ */ diff --git a/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp index 2e359fb..b53fb52 100644 --- a/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp +++ b/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp @@ -25,7 +25,7 @@ #include "CommandReceiverShadow.h" -#include "CommandSender.h" +#include "DBusCommandSender.h" #include "DBusWrapper.h" #include <audiomanagertypes.h> diff --git a/PluginCommandInterfaceDbus/src/CommandSender.cpp b/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp index 7b7f8ae..462e794 100644 --- a/PluginCommandInterfaceDbus/src/CommandSender.cpp +++ b/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp @@ -23,7 +23,7 @@ * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#include "CommandSender.h" +#include "DBusCommandSender.h" #include "DBusMessageHandler.h" #include "DBusWrapper.h" diff --git a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp index e6ee3f6..315a51e 100644 --- a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp +++ b/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp @@ -23,7 +23,7 @@ * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ #include "DBusMessageHandler.h" -#include "CommandSender.h" +#include "DBusCommandSender.h" #include "DBusConfiguration.h" #include <stdlib.h> |