From 6fd066365a7697c4334f5499b38eafe1f7d11f97 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Sun, 15 May 2016 01:46:25 +0200 Subject: [PATCH] Do not define unused variable DBUS_SESSION_SOCKET_DIR setting with cmake on Windows. This fixes also an undefined temp dir cmake error on cross compiling for windows. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99586 --- cmake/CMakeLists.txt | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 696ba7e..a34f0d9 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -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) -- 2.6.6