From: Simon McVittie Date: Wed, 4 Jan 2012 19:14:14 +0000 (+0000) Subject: Revert "keep cmake in sync with automake related to default bus addresses" X-Git-Tag: dbus-1.5.10~78 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a314ddbf8d08fb7d6916a891d4e3829c5675885;p=platform%2Fupstream%2Fdbus.git Revert "keep cmake in sync with automake related to default bus addresses" This reverts commit fdab4af0f4748f1fb5d23ca41e201cca4adb0b2f. Further discussion required. Related to https://bugs.freedesktop.org/show_bug.cgi?id=38201 --- diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 88b2eea..ba44d57 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -431,8 +431,8 @@ set (DBUS_USER ) if (WIN32) - set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "autolaunch:" CACHE STRING "system bus default address") - set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "autolaunch:" CACHE STRING "session bus 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")