Attachment 129211 Details for Bug 99586 – Fix issue missing temporary dir on cross compiling for windows with cmake.

[patch] Fix issue missing temporary dir on cross compiling for windows with cmake.

Fix-issue-missing-temporary-dir-on-cross-compiling.patch (text/plain), 1.40 KB, created by Ralf Habacker on 2017-01-29 09:25:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2017-01-29 09:25:55 UTC

Size: 1.40 KB

patch

obsolete

>From 9e357a5a4f11e5aeb06689413c8599a0625db244 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Sun, 15 May 2016 01:46:25 +0200
>Subject: [PATCH] Fix issue missing temporary dir on cross compiling for
> windows with cmake.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99586
>---
> cmake/CMakeLists.txt | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index dc1675f..c1da993 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -441,11 +441,15 @@ endif (MSVC_IDE)
>              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)
>+             if (CMAKE_CROSSCOMPILING)
>+                set (DBUS_SESSION_SOCKET_DIR /tmp)
>+             else()
>+                 #Should never happen, both TMP and TEMP seem always set on Windows
>+                 message(FATAL_ERROR "Could not determine a usable temporary directory")
>+             endif()
>+         else()
>             set (DBUS_SESSION_SOCKET_DIR /tmp)
>-         endif(WIN32)
>+         endif()
>          endif (NOT $ENV{TMP} STREQUAL "")
>      endif (NOT $ENV{TEMP} STREQUAL "")
>  endif (NOT $ENV{TMPDIR} STREQUAL "")
>-- 
>2.6.6

Actions: View | Splinter Review

Attachments on bug 99586: 129211 | 129212 | 129213 | 129214 | 129215 | 129235 | 129236

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.