diff options
author | Christian Mueller <christian@lmuc329619u.(none)> | 2011-12-12 21:43:47 +0100 |
---|---|---|
committer | Christian Mueller <christian@lmuc329619u.(none)> | 2011-12-12 21:43:47 +0100 |
commit | 205595e3d3e6a1d55be3c462ef02c9f828a77feb (patch) | |
tree | 9c1202619c7b9a66ed874ca1a0c81530ae06e426 /PluginControlInterface | |
parent | d85e69bbf6d8ec6e087c7af579686923c76079cd (diff) | |
download | audiomanager-205595e3d3e6a1d55be3c462ef02c9f828a77feb.tar.gz |
some updates, new tests
Diffstat (limited to 'PluginControlInterface')
-rw-r--r-- | PluginControlInterface/CMakeLists.txt | 16 | ||||
-rw-r--r-- | PluginControlInterface/include/ControlSender.h (renamed from PluginControlInterface/ControlSender.h) | 1 | ||||
-rw-r--r-- | PluginControlInterface/src/ControlSender.cpp (renamed from PluginControlInterface/ControlSender.cpp) | 6 |
3 files changed, 14 insertions, 9 deletions
diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt index aa3e52a..20f6622 100644 --- a/PluginControlInterface/CMakeLists.txt +++ b/PluginControlInterface/CMakeLists.txt @@ -2,15 +2,19 @@ cmake_minimum_required(VERSION 2.6) PROJECT(PluginControlInterface) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xlinker -export-dynamic") +#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xlinker -export-dynamic") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") -set(CMAKE_CXX_FLAGS "-g -pipe -g -Wall -W -D_REENTRANT") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -pipe -g -Wall -W -D_REENTRANT") + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}") set(STD_INCLUDE_DIRS "/usr/include") set(EXECUTABLE_OUTPUT_PATH ../../bin/) set(LIBRARY_OUTPUT_PATH ../plugins/control) set(DOC_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/../doc/PluginControl) set(AUDIO_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../includes) +set(INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/include) + set(DOCUMENT $ENV{gendoc}) FIND_PACKAGE(PkgConfig) pkg_check_modules(DLT REQUIRED automotive-dlt) @@ -22,16 +26,16 @@ INCLUDE_DIRECTORIES( ${STD_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${AUDIO_INCLUDES_FOLDER} + ${INCLUDES_FOLDER} ) # all source files go here -SET(PLUGIN_STANDARD_HOOKS_SRCS_CXX - ControlSender.cpp -) +file(GLOB PLUGIN_STANDARD_HOOKS_SRCS_CXX "src/*.cpp") add_library(PluginControlInterface SHARED ${PLUGIN_STANDARD_HOOKS_SRCS_CXX}) -TARGET_LINK_LIBRARIES(PluginControlInterface ${DLT_LIBRARIES} ) +TARGET_LINK_LIBRARIES(PluginControlInterface + ${DLT_LIBRARIES}) #add a target to generate API documentation with Doxygen find_package(Doxygen) diff --git a/PluginControlInterface/ControlSender.h b/PluginControlInterface/include/ControlSender.h index 4fae804..df41662 100644 --- a/PluginControlInterface/ControlSender.h +++ b/PluginControlInterface/include/ControlSender.h @@ -9,6 +9,7 @@ #define CONTROLSENDER_H_ #include <control/ControlSendInterface.h> +#include <control/ControlReceiveInterface.h> using namespace am; diff --git a/PluginControlInterface/ControlSender.cpp b/PluginControlInterface/src/ControlSender.cpp index f47c84c..cb3d0fa 100644 --- a/PluginControlInterface/ControlSender.cpp +++ b/PluginControlInterface/src/ControlSender.cpp @@ -24,9 +24,9 @@ ControlSenderPlugin::~ControlSenderPlugin() { // TODO Auto-generated destructor stub } -am_Error_e ControlSendInterface::startupController(ControlReceiveInterface* controlreceiveinterface) -{ -} +//am_Error_e ControlSendInterface::startupController(ControlReceiveInterface* controlreceiveinterface) +//{ +//} |