From 8cd61621ce45f848771f7406c9a14e2279ffff23 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 11 Jun 2010 10:30:35 +0200 Subject: [PATCH] Keep cmake default session and system bus address setup in sync with autotools. --- cmake/CMakeLists.txt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 2417c43..a9aa40e 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -418,22 +418,17 @@ set (DBUS_USER ) if (WIN32) - 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_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "system bus default address" ) + set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "session bus default address" ) + set (DBUS_SYSTEM_CONFIG_FILE "etc/dbus-1/system.conf") set (DBUS_SESSION_CONFIG_FILE "etc/dbus-1/session.conf") # bus-test expects a non empty string set (DBUS_USER "Administrator") set (DBUS_DATADIR "data") else (WIN32) - set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS unix:tmpdir=) - set (DBUS_SESSION_BUS_DEFAULT_ADDRESS unix:path=${DBUS_SESSION_SOCKET_DIR}) + set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "unix:tmpdir=" CACHE STRING "system bus default address" ) + set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "unix:path=${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "session bus default address" ) set (sysconfdir "") set (configdir ${sysconfdir}/dbus-1 ) set (DBUS_SYSTEM_CONFIG_FILE ${configdir}/system.conf) -- 2.7.4