From 5773404eb801e27179b7c3c7803a990145d6e94a Mon Sep 17 00:00:00 2001 From: Christian Mueller Date: Thu, 8 Dec 2011 18:43:48 +0100 Subject: total rework no more QT --- AudioManagerDaemon/CMakeLists.txt | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'AudioManagerDaemon/CMakeLists.txt') diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index 7508d72..aab505c 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -21,10 +21,13 @@ set(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(DOC_OUTPUT_PATH ../../doc/) set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../dbusInterfaces) +set(AUDIO_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../includes) +set(DBUS_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../dbusIncludes) +set(INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/include) set(DOC_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/../doc/AudioManager) +set(EXECUTABLE_OUTPUT_PATH ../../bin/) +set(DOC_OUTPUT_PATH ../../doc/) set(DOCUMENT $ENV{gendoc}) file(MAKE_DIRECTORY ${DOC_OUTPUT_PATH}) @@ -38,27 +41,18 @@ find_package (Threads) FIND_PACKAGE(DBUS REQUIRED) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS}) -#all source files go here -SET(AUDIOMAN_SRCS_CXX - main.cpp - AudioManagerCore.cpp - CommandHandler.cpp - CommandReceive.cpp - DataBaseHandler.cpp - HookEngine.cpp - Router.cpp - RoutingReceive.cpp - dbusRoothandler.cpp -) +file(GLOB AUDIOMAN_SRCS_CXX "src/*.cpp") -INCLUDE_DIRECTORIES( - include +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${DLT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIR} + ${AUDIO_INCLUDES_FOLDER} + ${INCLUDES_FOLDER} ${DBUS_ARCH_INCLUDE_DIR} + ${DBUS_INCLUDES_FOLDER} ) @@ -72,6 +66,8 @@ TARGET_LINK_LIBRARIES(AudioManager ${CMAKE_THREAD_LIBS_INIT} ) +add_subdirectory (test) + #add a target to generate API documentation with Doxygen find_package(Doxygen) if(DOXYGEN_FOUND) -- cgit v1.2.1