From dfcafbec34e0e454d9995551998af5d40a27c7ad Mon Sep 17 00:00:00 2001 From: christian mueller Date: Thu, 1 Mar 2012 19:12:55 +0100 Subject: * fix [GAM-28] problems in routingsender.cpp * [GAM-27] major refactoring: bringing everything to standardized names * Enhancement of CAmSerializer.h * improvement of documentation * adoption & regeneration of inerfaces --- cmake/AudioManagerCodestyle.xml | 155 +++++++++++++++++++++++++++++++++++++++ cmake/AudioManager_Codestyle.xml | 155 --------------------------------------- cmake/FindDBUS.cmake | 4 +- cmake/config.cmake | 2 - 4 files changed, 157 insertions(+), 159 deletions(-) create mode 100644 cmake/AudioManagerCodestyle.xml delete mode 100644 cmake/AudioManager_Codestyle.xml (limited to 'cmake') diff --git a/cmake/AudioManagerCodestyle.xml b/cmake/AudioManagerCodestyle.xml new file mode 100644 index 0000000..0ecdb53 --- /dev/null +++ b/cmake/AudioManagerCodestyle.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cmake/AudioManager_Codestyle.xml b/cmake/AudioManager_Codestyle.xml deleted file mode 100644 index 0ecdb53..0000000 --- a/cmake/AudioManager_Codestyle.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cmake/FindDBUS.cmake b/cmake/FindDBUS.cmake index e37b93a..0935b2f 100644 --- a/cmake/FindDBUS.cmake +++ b/cmake/FindDBUS.cmake @@ -35,8 +35,8 @@ SET( DBUS_FOUND "NO" ) IF(DBUS_LIBRARY) SET( DBUS_FOUND "YES" ) message(STATUS "Found DBUS libs: ${DBUS_LIBRARY}") - message(STATUS "Found DBUS includes: ${DBUS_INCLUDE_DIR}") - message(STATUS "Found DBUS arch dependent includes: ${DBUS_ARCH_INCLUDE_DIR}") + message(STATUS "Found DBUS include: ${DBUS_INCLUDE_DIR}") + message(STATUS "Found DBUS arch dependent include: ${DBUS_ARCH_INCLUDE_DIR}") ENDIF(DBUS_LIBRARY) MARK_AS_ADVANCED( diff --git a/cmake/config.cmake b/cmake/config.cmake index 2349bb7..8d1a8e6 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -19,6 +19,4 @@ #cmakedefine DBUS_SERVICE_PREFIX "@DBUS_SERVICE_PREFIX@" #cmakedefine DBUS_SERVICE_OBJECT_PATH "@DBUS_SERVICE_OBJECT_PATH@" -#cmakedefine INTROSPECTION_COMMAND_XML_FILE "@INTROSPECTION_COMMAND_XML_FILE@" - #endif /* _CONFIG_H */ -- cgit v1.2.1