fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-19 07:40:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not define unused variable DBUS_SESSION_SOCKET_DIR setting with cmake on Windows.

Browse source 
This fixes also an undefined temp dir cmake error on cross compiling for windows.

Reviewed-by: Simon McVittie <smcv@debian.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99586
This commit is contained in:
Ralf Habacker 2016-05-15 01:46:25 +02:00
parent 93aec34b10
commit a4d2fd408e
1 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
cmake/CMakeLists.txt
View file

@ -419,24 +419,17 @@ if (MSVC_IDE)
endif (MSVC_IDE)
#### Find socket directories
if (NOT $ENV{TMPDIR} STREQUAL "")
set (DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR})
else (NOT $ENV{TMPDIR} STREQUAL "")
if (NOT $ENV{TEMP} STREQUAL "")
set (DBUS_SESSION_SOCKET_DIR $ENV{TEMP})
else (NOT $ENV{TEMP} STREQUAL "")
if (NOT $ENV{TMP} STREQUAL "")
set (DBUS_SESSION_SOCKET_DIR $ENV{TMP})
else (NOT $ENV{TMP} STREQUAL "")
if (WIN32)
#Should never happen, both TMP and TEMP seem always set on Windows
message(FATAL_ERROR "Could not determine a usable temporary directory")
else(WIN32)
set (DBUS_SESSION_SOCKET_DIR /tmp)
endif(WIN32)
endif (NOT $ENV{TMP} STREQUAL "")
endif (NOT $ENV{TEMP} STREQUAL "")
endif (NOT $ENV{TMPDIR} STREQUAL "")
if(UNIX)
if(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()
endif()
# Not used on Windows, where there is no system bus
set (DBUS_SYSTEM_PID_FILE ${DBUS_LOCALSTATEDIR}/run/dbus/pid)
@ -501,11 +494,11 @@ if (DBUS_BUILD_TESTS)
# set variables used for the .in files (substituted by configure_file) in test/data:
set(DBUS_TEST_EXEC ${EXECUTABLE_OUTPUT_PATH}${IDE_BIN})
set(DBUS_TEST_DATA ${CMAKE_BINARY_DIR}/test/data)
set(TEST_SOCKET_DIR ${DBUS_SESSION_SOCKET_DIR} )
set(TEST_LAUNCH_HELPER_BINARY ${EXECUTABLE_OUTPUT_PATH}/dbus-daemon-launch-helper-test)
if (UNIX)
set (TEST_LISTEN "unix:tmpdir=${TEST_SOCKET_DIR}")
endif (UNIX)
set(TEST_SOCKET_DIR ${DBUS_SESSION_SOCKET_DIR})
set(TEST_LISTEN "unix:tmpdir=${TEST_SOCKET_DIR}")
endif()
if (WIN32)
set (TEST_LISTEN "tcp:host=localhost")
endif (WIN32)