From 6d7c17a9ab1bccbf0bc656c87818338de28f408d Mon Sep 17 00:00:00 2001 From: blacky Date: Fri, 15 Jul 2011 20:25:22 +0200 Subject: - first attempt to remove QT - this compiles but does not provide the same functionality - hookplugin compiles - other plugins do not --- AudioManagerDaemon/CMakeLists.txt | 41 +++------------------------------------ 1 file changed, 3 insertions(+), 38 deletions(-) (limited to 'AudioManagerDaemon/CMakeLists.txt') diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index aa1460e..eb96741 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -26,21 +26,13 @@ cmake_policy(SET CMP0015 NEW) file(MAKE_DIRECTORY ${DOC_OUTPUT_PATH}) -FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(PkgConfig) +pkg_check_modules(SQLITE REQUIRED sqlite3) pkg_check_modules(DLT REQUIRED automotive-dlt) pkg_check_modules(JACK REQUIRED jack) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS}) -# add Qt modules here, the include will setup QT_LIBRARIES -SET(QT_USE_QTSQL TRUE) -#SET(QT_USE_QTXML TRUE) -SET(QT_USE_QTDBUS TRUE) -SET(QT_USE_QTNETWORK TRUE) - -INCLUDE(${QT_USE_FILE}) - #all source files go here SET(AUDIOMAN_SRCS_CXX AudioManagerCore.cpp @@ -48,60 +40,33 @@ SET(AUDIOMAN_SRCS_CXX Router.cpp DataBaseHandler.cpp main.cpp - ${CMAKE_CURRENT_BINARY_DIR}/DBusCommand.cpp DBusCommandInterface.cpp HookEngine.cpp - ${DBUS_FOLDER}/DBusTypes.cpp + PluginHandler.cpp ) INCLUDE_DIRECTORIES( include ${CMAKE_SOURCE_DIR} ${STD_INCLUDE_DIRS} - ${GLIB_INCLUDE_DIRS} - ${PULSE_INCLUDE_DIRS} ${JACK_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${DBUS_FOLDER} - ${QT_INCLUDE_DIR} ${DLT_INCLUDE_DIRS} ) -#every header that contains QT stuff like Q_OBJECT .... and must be mocced -SET(AUDIOMAN_MOC_SRCS - Router.h - DataBaseHandler.h - DBusCommandInterface.h - AudioManagerCore.h - RoutingReceive.h - ${CMAKE_CURRENT_BINARY_DIR}/DBusCommand.h - -) - LINK_DIRECTORIES( ${LINK_DIRECTORIES} - ${GLIB_LIBRARY_DIRS} ${PULSE_LIBRARY_DIRS} ${JACK_LIBRARY_DIRS} ${DBUS_FOLDER} ${PROJECT_BINARY_DIR}/../plugins ) -#now take the headers, moc them and append the resulting moc files to the sources -QT4_WRAP_CPP(AUDIOMAN_SRCS_CXX ${AUDIOMAN_MOC_SRCS}) - ADD_EXECUTABLE(AudioManager ${AUDIOMAN_SRCS_CXX}) - -ADD_DEFINITIONS(${QT_DEFINITIONS}) - TARGET_LINK_LIBRARIES(AudioManager - ${QT_LIBRARIES} - RoutingPlugin - RoutingJackPlugin - TestPlugin - ${PULSE_LIBRARIES} - ${JACK_LIBRARIES} + ${SQLITE_LIBRARIES} ${DLT_LIBRARIES} ) -- cgit v1.2.1