Attachment 114030 Details for Bug 85418 – Move include file checks to ConfigureChecks.cmake for cmake build system.

[patch] Move include file checks to ConfigureChecks.cmake for cmake build system.

0002-Movw-include-file-checks-to-ConfigureChecks.cmake-for-.txt (text/plain), 2.17 KB, created by Ralf Habacker on 2015-03-05 12:49:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-03-05 12:49:41 UTC

Size: 2.17 KB

patch

obsolete

>From ee3f6f243afa5032293cf04052374242577f9b14 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Thu, 5 Mar 2015 13:06:10 +0100
>Subject: [PATCH 2/3] Move include file checks to ConfigureChecks.cmake for
> cmake build system.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=85418
>---
> cmake/CMakeLists.txt        | 5 -----
> cmake/ConfigureChecks.cmake | 1 +
> 2 files changed, 1 insertion(+), 5 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index 14685da..5094990 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -299,7 +299,6 @@ endif(NOT MSVC)
> if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
>     option (DBUS_BUS_ENABLE_INOTIFY "build with inotify support (linux only)" ON)
>     if(DBUS_BUS_ENABLE_INOTIFY)
>-        check_include_file(sys/inotify.h HAVE_SYS_INOTIFY_H)
>         if(NOT HAVE_SYS_INOTIFY_H)
>             message(FATAL_ERROR "sys/inotify.h not found!")
>         endif(NOT HAVE_SYS_INOTIFY_H)
>@@ -307,10 +306,6 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
> elseif("${CMAKE_SYSTEM_NAME}" MATCHES ".*BSD")
>     option (DBUS_BUS_ENABLE_KQUEUE "build with kqueue support (FreeBSD only)" ON)
>     if(DBUS_BUS_ENABLE_KQUEUE)
>-        # cmake check a header by compiling a test program with
>-        # the header, sys/event.h needs stdint.h and sys/types.h
>-        # to work.
>-        check_include_files("stdint.h;sys/types.h;sys/event.h" HAVE_SYS_EVENT_H)
>         if(NOT HAVE_SYS_EVENT_H)
>             message(FATAL_ERROR "sys/event.h not found!")
>         endif(NOT HAVE_SYS_EVENT_H)
>diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
>index da8c4fc..9864409 100644
>--- a/cmake/ConfigureChecks.cmake
>+++ b/cmake/ConfigureChecks.cmake
>@@ -23,6 +23,7 @@ check_include_file(stdio.h      HAVE_STDIO_H)   # dbus-sysdeps.h
> check_include_file(string.h     HAVE_STRING_H)
> check_include_file(strings.h     HAVE_STRINGS_H)
> check_include_file(syslog.h     HAVE_SYSLOG_H)
>+check_include_files("stdint.h;sys/types.h;sys/event.h" HAVE_SYS_EVENT_H)
> check_include_file(sys/inotify.h     HAVE_SYS_INOTIFY_H)
> check_include_file(sys/resource.h     HAVE_SYS_RESOURCE_H)
> check_include_file(sys/stat.h     HAVE_SYS_STAT_H)
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 85418: 108368 | 108369 | 114020 | 114021 | 114029 | 114030 | 114031 | 114040

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.