From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sat, 14 May 2016 23:46:25 +0000 (+0200)
Subject: Do not define unused variable DBUS_SESSION_SOCKET_DIR setting with cmake on Windows.
X-Git-Tag: dbus-1.11.10~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4d2fd408ef5556a4554ad10b689a012cbfb2608;p=thirdparty%2Fdbus.git

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.

Reviewed-by: Simon McVittie <smcv@debian.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99586
---

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 696ba7e30..a34f0d91e 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)