From 9761f0ee1fc85be9cb2ce99fdbfcc0aab712b286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Fri, 25 Aug 2017 18:07:42 +0200
Subject: [PATCH 1/3] ICONV include directories only used by exiv2lib

---
 config/findDependencies.cmake | 5 ++---
 src/CMakeLists.txt            | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/findDependencies.cmake b/config/findDependencies.cmake
index 235aa87d..086f7222 100644
--- a/config/findDependencies.cmake
+++ b/config/findDependencies.cmake
@@ -2,7 +2,6 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/")
 
 find_package(Threads REQUIRED)
-include( FindIconv )
 
 if( EXIV2_ENABLE_PNG )
     find_package( ZLIB REQUIRED )
@@ -38,12 +37,12 @@ if( EXIV2_ENABLE_NLS )
 endif( EXIV2_ENABLE_NLS )
 
 find_package(Iconv)
+include( FindIconv )
 if( ICONV_FOUND )
-    include_directories(${ICONV_INCLUDE_DIR})
     message ( "-- ICONV_INCLUDE_DIR : " ${ICONV_INCLUDE_DIR} )
     message ( "-- ICONV_LIBRARIES : " ${ICONV_LIBRARIES} )
     message ( "-- ICONV_ACCEPTS_CONST_INPUT : ${ICONV_ACCEPTS_CONST_INPUT}" )
-endif( ICONV_FOUND )
+endif()
 
 if( EXIV2_ENABLE_BUILD_PO )
     find_package(MSGFMT)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 093beb80..87a4d6f1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -241,6 +241,7 @@ if( EXIV2_ENABLE_NLS )
 endif()
 
 if( ICONV_FOUND )
+    target_include_directories( exiv2lib SYSTEM PRIVATE ${ICONV_INCLUDE_DIR})
     target_link_libraries( exiv2lib PRIVATE  ${ICONV_LIBRARIES} )
 endif()
 

From 0b82d35a26219ed54db4e2d5194073192d7136bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Fri, 25 Aug 2017 18:08:13 +0200
Subject: [PATCH 2/3] remove find_package(Iconv). We are already using our
 custom finder

---
 config/findDependencies.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/findDependencies.cmake b/config/findDependencies.cmake
index 086f7222..706e2c7b 100644
--- a/config/findDependencies.cmake
+++ b/config/findDependencies.cmake
@@ -36,7 +36,6 @@ if( EXIV2_ENABLE_NLS )
     # the manual check in config/generateConfigFile.cmake
 endif( EXIV2_ENABLE_NLS )
 
-find_package(Iconv)
 include( FindIconv )
 if( ICONV_FOUND )
     message ( "-- ICONV_INCLUDE_DIR : " ${ICONV_INCLUDE_DIR} )

From 532b4caa3c8c488001797ad6fc2afc68fe2f5178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Fri, 25 Aug 2017 18:08:32 +0200
Subject: [PATCH 3/3] Remove conditions from endif()

---
 config/findDependencies.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/findDependencies.cmake b/config/findDependencies.cmake
index 706e2c7b..116bf4f8 100644
--- a/config/findDependencies.cmake
+++ b/config/findDependencies.cmake
@@ -6,7 +6,7 @@ find_package(Threads REQUIRED)
 if( EXIV2_ENABLE_PNG )
     find_package( ZLIB REQUIRED )
     include_directories( ${ZLIB_INCLUDE_DIR} )
-endif( EXIV2_ENABLE_PNG )
+endif( )
 
 if( EXIV2_ENABLE_WEBREADY )
     set( ENABLE_WEBREADY 1 )
@@ -16,12 +16,12 @@ if( EXIV2_ENABLE_WEBREADY )
 
     if( EXIV2_ENABLE_SSH )
         find_package( SSH REQUIRED)
-    endif( EXIV2_ENABLE_SSH )
-endif( EXIV2_ENABLE_WEBREADY )
+    endif( )
+endif( )
 
 if (EXIV2_ENABLE_XMP)
     find_package(EXPAT REQUIRED)
-endif (EXIV2_ENABLE_XMP)
+endif ()
 
 if( EXIV2_ENABLE_NLS )
     find_package(Intl)
@@ -34,7 +34,7 @@ if( EXIV2_ENABLE_NLS )
     set( ENABLE_NLS 1 )
     # TODO : This is assuming that Intl is always found. This check should be improved and remove
     # the manual check in config/generateConfigFile.cmake
-endif( EXIV2_ENABLE_NLS )
+endif( )
 
 include( FindIconv )
 if( ICONV_FOUND )
@@ -48,5 +48,5 @@ if( EXIV2_ENABLE_BUILD_PO )
     if(MSGFMT_FOUND)
         message(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})")
         set( EXIV2_BUILD_PO 1 )
-    endif(MSGFMT_FOUND)
+    endif()
 endif()