diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-11 17:37:49 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2014-09-15 13:33:21 +0200 |
| commit | 87448fed6f37ab0f036d88ac0d4af2e1bfc59a69 (patch) | |
| tree | 103689c05d575abfe66f9de0bcf2e066961fa323 /cmake | |
| parent | 3765075c5f7c115abd10b0b76df81ae230ffceae (diff) | |
| download | dbus-87448fed6f37ab0f036d88ac0d4af2e1bfc59a69.tar.gz | |
Make various system-bus-related things Unix-only
There is no system bus on Windows, and there won't be until/unless
it can be secure.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83583
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 41882d73..09e9cf8e 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -400,13 +400,8 @@ endif (MSVC_IDE) endif (NOT $ENV{TEMP} STREQUAL "") endif (NOT $ENV{TMPDIR} STREQUAL "") -# TODO: fix redhet -if (WIN32) - # bus-test expects a non empty string - set (DBUS_SYSTEM_PID_FILE "/dbus-pid") -else (WIN32) - set (DBUS_SYSTEM_PID_FILE ${EXPANDED_LOCALSTATEDIR}/run/dbus/pid) -endif (WIN32) + # Not used on Windows, where there is no system bus +set (DBUS_SYSTEM_PID_FILE ${EXPANDED_LOCALSTATEDIR}/run/dbus/pid) if (WIN32) set (DBUS_CONSOLE_AUTH_DIR "") |