From 07de94e1a00d068a8a859ecd4dab5d03bc9ab70b Mon Sep 17 00:00:00 2001 From: Luis Diaz Mas Date: Mon, 31 Jul 2017 17:17:30 +0200 Subject: [PATCH] Handle HAVE_MEMORY_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 ed3af731..021033f5 100644 --- a/config/CMakeChecks.txt +++ b/config/CMakeChecks.txt @@ -72,7 +72,6 @@ ENDIF( EXIV2_ENABLE_COMMERCIAL ) # checking for Header files check_include_file( "inttypes.h" have_inttypes_h ) -check_include_file( "memory.h" HAVE_MEMORY_H ) check_include_file( "stdbool.h" HAVE_STDBOOL_H ) check_include_file( "stdint.h" HAVE_STDINT_H ) check_include_file( "stdlib.h" HAVE_STDLIB_H ) @@ -125,8 +124,7 @@ IF( NOT MSVC ) SET( HAVE_PID_T TRUE ) ENDIF( NOT MSVC ) -SET( EXV_SYMBOLS HAVE_MEMORY_H - HAVE_MEMSET +SET( EXV_SYMBOLS HAVE_MEMSET HAVE_MMAP HAVE_MUNMAP HAVE_PRINTUCS2 diff --git a/config/config.h.cmake b/config/config.h.cmake index d863e00d..cc86ec91 100644 --- a/config/config.h.cmake +++ b/config/config.h.cmake @@ -53,8 +53,8 @@ /* Define to 1 if you have the header file. */ #cmakedefine EXV_HAVE_REGEX 1 -/* Define to 1 if you have the header file. */ -#cmakedefine EXV_HAVE_MEMORY_H 1 +// Definition to indicate you have the header file. +#cmakedefine EXV_HAVE_MEMORY_H /* Define to 1 if you have the `memset' function. */ #cmakedefine EXV_HAVE_MEMSET 1 diff --git a/config/generateConfigFile.cmake b/config/generateConfigFile.cmake index a2a7f100..962b93e4 100644 --- a/config/generateConfigFile.cmake +++ b/config/generateConfigFile.cmake @@ -20,6 +20,7 @@ check_function_exists( gmtime_r EXV_HAVE_GMTIME_R ) # TODO: This check should be removed and rely on the check done in findDependencies.cmake 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 ) if (NOT EXV_HAVE_LIBINTL_H) set(EXV_ENABLE_NLS 0)