From 5fa8f5aa87d64afa63cf49d45036366fe266e34d Mon Sep 17 00:00:00 2001 From: Luis Diaz Mas Date: Thu, 31 May 2018 17:49:55 +0200 Subject: [PATCH] CMake: minimum version bumped to 3.3.2 --- CMakeLists.txt | 2 +- config/findDependencies.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9996c976..c14f7a7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists.txt for exiv2 library -cmake_minimum_required( VERSION 3.1.0 ) +cmake_minimum_required( VERSION 3.3.2 ) project( exiv2 ) include(GNUInstallDirs) diff --git a/config/findDependencies.cmake b/config/findDependencies.cmake index 09d0b09e..683a2a47 100644 --- a/config/findDependencies.cmake +++ b/config/findDependencies.cmake @@ -50,7 +50,7 @@ if( EXIV2_ENABLE_NLS ) # the manual check in config/generateConfigFile.cmake endif( ) -include( FindIconv ) +find_package(Iconv) if( ICONV_FOUND ) message ( "-- ICONV_INCLUDE_DIR : " ${Iconv_INCLUDE_DIR} ) message ( "-- ICONV_LIBRARIES : " ${Iconv_LIBRARY} )