Attachment 134911 Details for Bug 103015 – Fix cmake 3.5 configure error on opening a non existant file

[patch] Fix cmake 3.5 configure error on opening a non existant file

Fix-cmake-35-configure-error-on-opening-a-non-exis.patch (text/plain), 1.08 KB, created by Ralf Habacker on 2017-10-18 13:53:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2017-10-18 13:53:58 UTC

Size: 1.08 KB

patch

obsolete

>From 01dd17ec7cdc1d438855a0b4b932acd8d0585332 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Tue, 17 Oct 2017 17:14:43 +0200
>Subject: [PATCH] Fix cmake 3.5 configure error on opening a non existant file
>
>Previous cmake versions seemed to be more tolerant.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103015
>Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
>---
> cmake/modules/Macros.cmake | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/cmake/modules/Macros.cmake b/cmake/modules/Macros.cmake
>index 186c0b09..63b2171b 100644
>--- a/cmake/modules/Macros.cmake
>+++ b/cmake/modules/Macros.cmake
>@@ -10,7 +10,7 @@ if(DBUS_BUILD_TESTS AND CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_NAME STREQUAL "Win
>             PATHS /proc/sys/fs/binfmt_misc
>             NO_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH
>         )
>-        if(BINFMT_WINE_SUPPORT_FILE)
>+        if(EXISTS BINFMT_WINE_SUPPORT_FILE)
>             file(READ ${BINFMT_WINE_SUPPORT_FILE} CONTENT)
>             if(${CONTENT} MATCHES "enabled")
>                 set(HAVE_BINFMT_WINE_SUPPORT 1)
>-- 
>2.12.3

Actions: View | Splinter Review

Attachments on bug 103015: 134523 | 134534 | 134535 | 134536 | 134537 | 134544 | 134545 | 134546 | 134565 | 134695 | 134696 | 134703 | 134704 | 134716 | 134719 | 134882 | 134883 | 134885 | 134886 | 134887 | 134909 | 134910 | 134911 | 134913 | 134924

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.