summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorchristian mueller <christian.ei.mueller@bmw.de>2012-01-10 15:58:38 +0100
committerchristian mueller <christian.ei.mueller@bmw.de>2012-01-12 00:09:34 +0100
commit472d0762b68ce0f2a755b4215515a3e031831495 (patch)
tree276e811f00dfe17cba15c56092b33d67ba2793f6 /cmake
parent6ebae8c4d3a340c135ed2f5f611a0e1c31994164 (diff)
downloadaudiomanager-472d0762b68ce0f2a755b4215515a3e031831495.tar.gz
* recreated the header files out of the model. Added versioning support in the headerfiles generated
* ensured compatibility with 64 bit systems while compiling dbus [ changed FindDBUS.cmake] * updated the README to better support building * updated typo in introspectable string of DBusWrapper * reworked including strategie * added getInterfafeVersion method on all interfaces * added Interface Versioning support * added version as part of .so ending * it is no possible to set a vector of source and sink sound properties at a time * added interface to ask for all loaded plugins on RoutingSender * added first version of telnet server (not yet productive) - set to not active in CMakeLists.txt * added changelog (created out of git commit log) * added default values for all enum types to be save even on other if communication is on other domain
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindDBUS.cmake1
-rw-r--r--cmake/config.cmake4
2 files changed, 5 insertions, 0 deletions
diff --git a/cmake/FindDBUS.cmake b/cmake/FindDBUS.cmake
index 48bc348..e37b93a 100644
--- a/cmake/FindDBUS.cmake
+++ b/cmake/FindDBUS.cmake
@@ -23,6 +23,7 @@ FIND_PATH(DBUS_INCLUDE_DIR dbus/dbus.h
FIND_PATH(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h
/usr/lib/dbus-1.0/include
+/usr/lib/*/dbus-1.0/include
)
FIND_LIBRARY(DBUS_LIBRARY
diff --git a/cmake/config.cmake b/cmake/config.cmake
index c5a9b1a..a0856db 100644
--- a/cmake/config.cmake
+++ b/cmake/config.cmake
@@ -7,11 +7,15 @@
#cmakedefine WITH_SOCKETHANDLER_LOOP
#cmakedefine WITH_SIMPLEDBUS_LOOP
#cmakedefine WITH_PPOLL
+#cmakedefine WITH_TELNET
#cmakedefine DEFAULT_PLUGIN_COMMAND_DIR "@DEFAULT_PLUGIN_COMMAND_DIR@"
#cmakedefine DEFAULT_PLUGIN_ROUTING_DIR "@DEFAULT_PLUGIN_ROUTING_DIR@"
#cmakedefine CONTROLLER_PLUGIN "@CONTROLLER_PLUGIN@"
+#cmakedefine DEFAULT_TELNETPORT @DEFAULT_TELNETPORT@
+#cmakedefine MAX_TELNETCONNECTIONS @MAX_TELNETCONNECTIONS@
+
#cmakedefine DBUS_SERVICE_PREFIX "@DBUS_SERVICE_PREFIX@"
#cmakedefine DBUS_SERVICE_OBJECT_PATH "@DBUS_SERVICE_OBJECT_PATH@"