From 6a53b149d16936e7e0f62cfcc697990fa1ea73d3 Mon Sep 17 00:00:00 2001 From: Luis Diaz Mas Date: Mon, 31 Jul 2017 17:48:47 +0200 Subject: [PATCH] Handle HAVE_PROCESS_H variable in the new cmake file --- config/CMakeChecks.txt | 4 +--- config/config.h.cmake | 4 ++-- config/generateConfigFile.cmake | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt index 6d838c1a..e70d3d45 100644 --- a/config/CMakeChecks.txt +++ b/config/CMakeChecks.txt @@ -80,7 +80,6 @@ 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/mman.h" HAVE_SYS_MMAN_H ) -check_include_file( "process.h" HAVE_PROCESS_H ) check_include_file( "regex.h" HAVE_REGEX ) check_function_exists( realloc HAVE_REALLOC ) @@ -119,8 +118,7 @@ IF( NOT MSVC ) SET( HAVE_PID_T TRUE ) ENDIF( NOT MSVC ) -SET( EXV_SYMBOLS HAVE_PROCESS_H - HAVE_REALLOC +SET( EXV_SYMBOLS HAVE_REALLOC HAVE_STDBOOL_H HAVE_STDINT_H HAVE_STDLIB_H diff --git a/config/config.h.cmake b/config/config.h.cmake index 776ea48f..8d01e533 100644 --- a/config/config.h.cmake +++ b/config/config.h.cmake @@ -135,8 +135,8 @@ #endif #endif -/* Define to 1 if you have the header file. */ -#cmakedefine EXV_HAVE_PROCESS_H 1 +// Definition to indicate if you have the header file. +#cmakedefine EXV_HAVE_PROCESS_H /* Define to 1 if you have the Adobe XMP Toolkit. */ #cmakedefine EXV_HAVE_XMP_TOOLKIT 1 diff --git a/config/generateConfigFile.cmake b/config/generateConfigFile.cmake index e27e54e1..0477e212 100644 --- a/config/generateConfigFile.cmake +++ b/config/generateConfigFile.cmake @@ -25,6 +25,7 @@ check_function_exists( munmap EXV_HAVE_MUNMAP ) check_include_file( "libintl.h" EXV_HAVE_LIBINTL_H ) check_include_file( "unistd.h" EXV_HAVE_UNISTD_H ) check_include_file( "memory.h" EXV_HAVE_MEMORY_H ) +check_include_file( "process.h" EXV_HAVE_PROCESS_H ) if (NOT EXV_HAVE_LIBINTL_H) set(EXV_ENABLE_NLS 0)