diff --git a/CMakeLists.txt b/CMakeLists.txt index 49ae125b..82c1493a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -562,23 +562,9 @@ if(MSVC_IDE) file(REMOVE ${PROJECT_BINARY_DIR}/data/dbus-1/services) endif() -#### Find socket directories -set(DBUS_SESSION_SOCKET_DIR "" CACHE STRING "Default directory for session socket") -if(UNIX) - if (CMAKE_CROSSCOMPILING) - if (NOT DBUS_SESSION_SOCKET_DIR) - message(FATAL_ERROR "cannot autodetect session socket directory " - "when crosscompiling, pass -DDBUS_SESSION_SOCKET_DIR=...") - endif() - elseif(NOT $ENV{TMPDIR} STREQUAL "") - set(DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR}) - elseif(NOT $ENV{TEMP} STREQUAL "") - set(DBUS_SESSION_SOCKET_DIR $ENV{TEMP}) - elseif(NOT $ENV{TMP} STREQUAL "") - set(DBUS_SESSION_SOCKET_DIR $ENV{TMP}) - else() - set(DBUS_SESSION_SOCKET_DIR /tmp) - 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() # Not used on Windows, where there is no system bus diff --git a/meson.build b/meson.build index 65bb9d0d..451da911 100644 --- a/meson.build +++ b/meson.build @@ -1070,19 +1070,11 @@ endif data_config.set('SYSCONFDIR_FROM_PKGDATADIR', sysconfdir_from_pkgdatadir) data_config.set('DATADIR_FROM_PKGSYSCONFDIR', datadir_from_pkgsysconfdir) -#### Find socket directories -values = run_command(python, '-c', - 'import os; [print(os.getenv(e, "")) for e in ["TMPDIR", "TEMP", "TMP"]]', - check: true, -).stdout() -values += '/tmp' -default_socket_dir = values.strip().split('\n')[0] - if platform_unix session_socket_dir = get_option('session_socket_dir') if session_socket_dir == '' - session_socket_dir = default_socket_dir + session_socket_dir = '/tmp' endif config.set_quoted('DBUS_SESSION_SOCKET_DIR', session_socket_dir)