From 3db066d0e188562b3fc77f7e13561c0e0a50a362 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Mon, 30 Jan 2017 19:34:38 +0100 Subject: [PATCH] Do not dump unused DBUS_SYSTEM_BUS_DEFAULT_ADDRESS variable on windows. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99586 --- cmake/CMakeLists.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index a34f0d9..2c397d2 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -543,7 +543,7 @@ GET_FILENAME_COMPONENT(C_COMPILER ${CMAKE_C_COMPILER} NAME) GET_FILENAME_COMPONENT(CXX_COMPILER ${CMAKE_CXX_COMPILER} NAME) message(" D-BUS ${DBUS_VERSION} ") -message(" ============ ") +message(" ============= ") message(" ") message(" install prefix: ${prefix} ") message(" install exec_prefix: ${exec_prefix} ") @@ -581,19 +581,18 @@ message(" Building kqueue support: ${DBUS_BUS_ENABLE_KQUEUE} " message(" Building Doxygen docs: ${DBUS_ENABLE_DOXYGEN_DOCS} ") message(" Building XML docs: ${DBUS_ENABLE_XML_DOCS} ") message(" Daemon executable name: ${DBUS_DAEMON_NAME}") -if (WIN32) -message(" System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} ") +if(WIN32) message(" Session bus listens on: ${DBUS_SESSION_BUS_LISTEN_ADDRESS} ") message(" Session clients connect to: ${DBUS_SESSION_BUS_CONNECT_ADDRESS} ") -else (WIN32) -message(" System bus socket: ${DBUS_SYSTEM_SOCKET} ") +else() message(" System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} ") +message(" System bus socket: ${DBUS_SYSTEM_SOCKET} ") message(" System bus PID file: ${DBUS_SYSTEM_PID_FILE} ") +message(" System bus user: ${DBUS_USER} ") message(" Session bus socket dir: ${DBUS_SESSION_SOCKET_DIR} ") message(" Console auth dir: ${DBUS_CONSOLE_AUTH_DIR} ") -message(" System bus user: ${DBUS_USER} ") message(" 'make check' socket dir: ${TEST_SOCKET_DIR} ") -endif (WIN32) +endif() message(" Test listen address: ${TEST_LISTEN} ") if (MSVC) message(" build timestamp: ${DBUS_BUILD_TIMESTAMP} ") -- 2.6.6