From 81cb503f7b29f662ce1ac684577a9a96b1bef0a1 Mon Sep 17 00:00:00 2001 From: Luis Diaz Mas Date: Tue, 8 Aug 2017 19:41:27 +0200 Subject: [PATCH] Handle EXV_HAVE_INTTYPES_H in the new cmake file --- config/CMakeChecks.txt | 5 ----- config/generateConfigFile.cmake | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt index 5b20dc01..1a27dc63 100644 --- a/config/CMakeChecks.txt +++ b/config/CMakeChecks.txt @@ -31,8 +31,6 @@ # # ConfigureChecks for exiv2 -INCLUDE( CheckIncludeFile ) - INCLUDE( GNUInstallDirs ) INCLUDE_DIRECTORIES( ${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/include ) @@ -49,9 +47,6 @@ IF( EXIV2_ENABLE_COMMERCIAL ) ADD_DEFINITIONS( -DEXV_COMMERCIAL_VERSION ) ENDIF( EXIV2_ENABLE_COMMERCIAL ) -# checking for Header files -check_include_file( "inttypes.h" have_inttypes_h ) - # when removing support of VS solution files, get rid of this stuff #VSslnCompat IF (MSVC) diff --git a/config/generateConfigFile.cmake b/config/generateConfigFile.cmake index 17500a6d..56fe5881 100644 --- a/config/generateConfigFile.cmake +++ b/config/generateConfigFile.cmake @@ -42,6 +42,7 @@ check_include_file( "sys/mman.h" EXV_HAVE_SYS_MMAN_H ) check_include_file( "sys/stat.h" EXV_HAVE_SYS_STAT_H ) check_include_file( "sys/types.h" EXV_HAVE_SYS_TYPES_H ) check_include_file( "regex.h" EXV_HAVE_REGEX ) +check_include_file( "inttypes.h" EXV_HAVE_INTTYPES_H ) if (NOT EXV_HAVE_LIBINTL_H) set(EXV_ENABLE_NLS 0)