diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5fe4da6f50..6563683b40 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -252,12 +252,33 @@ if( EXIV2_ENABLE_NLS )
     target_compile_definitions(exiv2lib PUBLIC EXV_LOCALEDIR="${EXV_LOCALEDIR}")
 endif()
 
+<<<<<<< HEAD
 if( Iconv_FOUND AND Iconv_LIBRARIES )
     target_link_libraries( exiv2lib PRIVATE Iconv::Iconv )
     list(APPEND libs_private_list "iconv")
     set(EXV_HAVE_LIBICONV TRUE PARENT_SCOPE)
 else()
     set(EXV_HAVE_LIBICONV FALSE PARENT_SCOPE)
+=======
+if(EXIV2_ENABLE_NLS)
+  target_link_libraries(exiv2lib PRIVATE ${Intl_LIBRARIES})
+  target_include_directories(exiv2lib PRIVATE ${Intl_INCLUDE_DIRS})
+  target_include_directories(exiv2lib_int PRIVATE ${Intl_INCLUDE_DIRS})
+  if(Intl_LIBRARIES)
+    list(APPEND libs_private_list "intl")
+  endif()
+  # Definition needed for translations
+  join_paths(EXV_LOCALEDIR ".." "${CMAKE_INSTALL_LOCALEDIR}")
+  target_compile_definitions(exiv2lib PUBLIC EXV_LOCALEDIR="${EXV_LOCALEDIR}")
+endif()
+
+if(Iconv_FOUND AND Iconv_LIBRARIES)
+  target_link_libraries(exiv2lib PRIVATE Iconv::Iconv)
+  list(APPEND libs_private_list "iconv")
+  set(EXV_HAVE_LIBICONV TRUE)
+else()
+  set(EXV_HAVE_LIBICONV FALSE)
+>>>>>>> 85456148 (Fix iconv dependency export in CMake config file)
 endif()
 
 if( EXIV2_ENABLE_INIH )