From 0c31f849321dd8880900e7ae1a921e570d256606 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 1 Dec 2009 11:59:53 +0100 Subject: [PATCH] added cmake option for using nonce-tcp protocol as default; set tcp as default protocol to be compatible with earlier dbus releases --- cmake/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 937da83..66b0e0e 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -459,8 +459,14 @@ set (DBUS_USER ) if (WIN32) - set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:host=localhost,port=0") - set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "nonce-tcp:host=localhost,port=0") + OPTION(DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS "Use nonce tcp default address" OFF) + if (DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS) + set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:host=localhost,port=0") + set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "nonce-tcp:host=localhost,port=0") + else (DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS) + set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "tcp:host=localhost,port=12434") + set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "tcp:host=localhost,port=12434") + endif (DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS) set (DBUS_SYSTEM_CONFIG_FILE "etc/system.conf") set (DBUS_SESSION_CONFIG_FILE "etc/session.conf") # bus-test expects a non empty string -- 2.7.4