Commit 8cd61621 authored by Ralf Habacker's avatar Ralf Habacker

Keep cmake default session and system bus address setup in sync with autotools.

parent 58fe0ade
...@@ -418,22 +418,17 @@ set (DBUS_USER ) ...@@ -418,22 +418,17 @@ set (DBUS_USER )
if (WIN32) if (WIN32)
OPTION(DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS "Use nonce tcp default address" OFF) set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "system bus default address" )
if (DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS) set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "session bus 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/dbus-1/system.conf") set (DBUS_SYSTEM_CONFIG_FILE "etc/dbus-1/system.conf")
set (DBUS_SESSION_CONFIG_FILE "etc/dbus-1/session.conf") set (DBUS_SESSION_CONFIG_FILE "etc/dbus-1/session.conf")
# bus-test expects a non empty string # bus-test expects a non empty string
set (DBUS_USER "Administrator") set (DBUS_USER "Administrator")
set (DBUS_DATADIR "data") set (DBUS_DATADIR "data")
else (WIN32) else (WIN32)
set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS unix:tmpdir=) 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}) set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "unix:path=${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "session bus default address" )
set (sysconfdir "") set (sysconfdir "")
set (configdir ${sysconfdir}/dbus-1 ) set (configdir ${sysconfdir}/dbus-1 )
set (DBUS_SYSTEM_CONFIG_FILE ${configdir}/system.conf) set (DBUS_SYSTEM_CONFIG_FILE ${configdir}/system.conf)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment