fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-20 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmake: Make DBUS_SESSION_SOCKET_DIR in CMakeCache.txt consistent with config.h

Browse source 
It's unexpected to have DBUS_SESSION_SOCKET_DIR take different values in
CMakeCache.txt, which lists the variables that are available to be set
by the caller, and in config.h, which makes their final values available
to the C code. If DBUS_SESSION_SOCKET_DIR is empty and we are running
on Unix, set it to its dynamically-chosen fallback before storing it in
the cache.

[smcv: Add commit message]
Co-authored-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Ralf Habacker 2025-04-28 14:32:02 +00:00 • committed by Simon McVittie
parent d7afc131bf
commit 91d9e604d4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -562,10 +562,10 @@ if(MSVC_IDE)
file(REMOVE ${PROJECT_BINARY_DIR}/data/dbus-1/services)
endif()
set(DBUS_SESSION_SOCKET_DIR "" CACHE STRING "Default directory for session socket on Unix")
if(UNIX AND NOT DBUS_SESSION_SOCKET_DIR)
set(DBUS_SESSION_SOCKET_DIR /tmp)
endif()
set(DBUS_SESSION_SOCKET_DIR "${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "Default directory for session socket on Unix")
# Not used on Windows, where there is no system bus
set(DBUS_SYSTEM_PID_FILE ${DBUS_RUNSTATEDIR}/dbus/pid)