From 9761f0ee1fc85be9cb2ce99fdbfcc0aab712b286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Fri, 25 Aug 2017 18:07:42 +0200 Subject: [PATCH] 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()