From f4876e7cb5815f5d329f9517d96a1df88688cf9f Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Fri, 1 Apr 2022 11:09:45 +0000 Subject: cmake: Correct DBUS_{SYSTEM,SESSION}_CONFIG_FILE on UNIX systems We always install to a dbus-1 subdir, but the path encoded in the binary was missing the dbus-1/ subdirectory, so we end up getting errors when trying to load it. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 99f102c5..c7fc6f2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -625,8 +625,8 @@ if(WIN32) else(WIN32) set(DBUS_SESSION_BUS_LISTEN_ADDRESS "unix:tmpdir=${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "session bus default listening address") set(DBUS_SESSION_BUS_CONNECT_ADDRESS "autolaunch:" CACHE STRING "session bus fallback address for clients") - set(DBUS_SYSTEM_CONFIG_FILE ${DBUS_DATADIR}/system.conf) - set(DBUS_SESSION_CONFIG_FILE ${DBUS_DATADIR}/session.conf) + set(DBUS_SYSTEM_CONFIG_FILE ${DBUS_DATADIR}/dbus-1/system.conf) + set(DBUS_SESSION_CONFIG_FILE ${DBUS_DATADIR}/dbus-1/session.conf) set(DBUS_USER "messagebus") set(DBUS_TEST_USER "nobody") # For best security, assume that all non-Windows platforms can do -- cgit v1.2.1