From 205595e3d3e6a1d55be3c462ef02c9f828a77feb Mon Sep 17 00:00:00 2001 From: Christian Mueller Date: Mon, 12 Dec 2011 21:43:47 +0100 Subject: some updates, new tests --- PluginControlInterface/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'PluginControlInterface/CMakeLists.txt') 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) -- cgit v1.2.1