From a7767a04e627d6e844739ae7245a35db915371ee Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Wed, 8 Feb 2017 21:38:41 +0100 Subject: [PATCH] Add all header checks from configure.ac to CMake The CMake build now checks for the same headers as the Autotools build. The following headers checks were added: - crt_externs.h - fcntl.h - memory.h - search.h - sys/inotify.h - sys/ioctl.h - sys/mman.h - sys/select.h - sys/time.h - sys/vfork.h - termios.h - vfork.h - X11/Intrinsic.h - X11/Xaw/Text.h --- cmake/config_checks.cmake | 25 +++++++++++++++++++------ config-cmake.h.in | 13 +++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/cmake/config_checks.cmake b/cmake/config_checks.cmake index ce3f73021..dd9778fbd 100644 --- a/cmake/config_checks.cmake +++ b/cmake/config_checks.cmake @@ -1,12 +1,25 @@ # Header checks include(CheckIncludeFile) -check_include_file( malloc.h HAVE_MALLOC_H ) -check_include_file( stat.h HAVE_STAT_H ) -check_include_file( strings.h HAVE_STRINGS_H ) -check_include_file( sys/stat.h HAVE_SYS_STAT_H ) -check_include_file( sys/types.h HAVE_SYS_TYPES_H ) -check_include_file( unistd.h HAVE_UNISTD_H ) +check_include_file( crt_externs.h HAVE_CRT_EXTERNS_H ) +check_include_file( fcntl .h HAVE_FCNTL_H ) +check_include_file( malloc.h HAVE_MALLOC_H ) +check_include_file( search.h HAVE_SEARCH_H ) +check_include_file( stat.h HAVE_STAT_H ) +check_include_file( strings.h HAVE_STRINGS_H ) +check_include_file( sys/inotify.h HAVE_SYS_INOTIFY_H ) +check_include_file( sys/ioctl.h HAVE_SYS_IOCTL_H ) +check_include_file( sys/mman.h HAVE_SYS_MMAN_H ) +check_include_file( sys/select.h HAVE_SYS_SELECT_H ) +check_include_file( sys/stat.h HAVE_SYS_STAT_H ) +check_include_file( sys/time.h HAVE_SYS_TIME_H ) +check_include_file( sys/types.h HAVE_SYS_TYPES_H ) +check_include_file( sys/vfork.h HAVE_SYS_VFORK_H ) +check_include_file( termios.h HAVE_TERMIOS_H ) +check_include_file( unistd.h HAVE_UNISTD_H ) +check_include_file( vfork.h HAVE_VFORK_H ) +check_include_file( X11/Intrinsic.h HAVE_X11_INTRINSIC_H ) +check_include_file( X11/Xaw/Text.h HAVE_X11_XAW_TEXT_H ) # Function checks include(CheckFunctionExists) diff --git a/config-cmake.h.in b/config-cmake.h.in index ec6a36f7a..de5ddfe07 100644 --- a/config-cmake.h.in +++ b/config-cmake.h.in @@ -3,12 +3,25 @@ #define PACKAGE_VERSION "@GRAPHVIZ_VERSION_FULL@" // Include headers +#cmakedefine HAVE_CRT_EXTERNS_H +#cmakedefine HAVE_FCNTL_H #cmakedefine HAVE_MALLOC_H +#cmakedefine HAVE_SEARCH_H #cmakedefine HAVE_STAT_H #cmakedefine HAVE_STRINGS_H +#cmakedefine HAVE_SYS_INOTIFY_H +#cmakedefine HAVE_SYS_IOCTL_H +#cmakedefine HAVE_SYS_MMAN_H +#cmakedefine HAVE_SYS_SELECT_H #cmakedefine HAVE_SYS_STAT_H +#cmakedefine HAVE_SYS_TIME_H #cmakedefine HAVE_SYS_TYPES_H +#cmakedefine HAVE_SYS_VFORK_H +#cmakedefine HAVE_TERMIOS_H #cmakedefine HAVE_UNISTD_H +#cmakedefine HAVE_VFORK_H +#cmakedefine HAVE_X11_INTRINSIC_H +#cmakedefine HAVE_X11_XAW_TEXT_H // Functions #cmakedefine HAVE_DRAND48 -- 2.40.0