Switch to CMake provided FindIconv

Exiv2 · Jan 26, 2023 · 19cd925 · 19cd925
1 parent 356cab8
commit 19cd925
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 136 deletions.
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -262,11 +262,9 @@ if( EXIV2_ENABLE_NLS )
     target_compile_definitions(exiv2lib PUBLIC EXV_LOCALEDIR="${EXV_LOCALEDIR}")
 endif()
 
-if( ICONV_FOUND )
+if( Iconv_FOUND AND Iconv_LIBRARIES )
     target_link_libraries( exiv2lib PRIVATE Iconv::Iconv )
-    if(NOT Iconv_IS_BUILT_IN)
-        list(APPEND requires_private_list "iconv")
-    endif()
+    list(APPEND requires_private_list "iconv")
 endif()
 
 if( EXIV2_ENABLE_INIH )