Export more dependencies in CMake config

brotli and inih are not included as CMake doesn't ship standard find modules for those
Exiv2 · Dec 20, 2024 · f043d0c · f043d0c
1 parent 09b448d
commit f043d0c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/cmake/exiv2Config.cmake.in b/cmake/exiv2Config.cmake.in
@@ -7,10 +7,24 @@ if(@EXIV2_ENABLE_PNG@) # if(EXIV2_ENABLE_PNG)
   find_dependency(ZLIB REQUIRED)
 endif()
 
+if(@EXIV2_ENABLE_WEBREADY@) # if(EXIV2_ENABLE_WEBREADY)
+  if(@EXIV2_ENABLE_CURL@) # if(EXIV2_ENABLE_CURL)
+    find_dependency(CURL REQUIRED)
+  endif()
+endif()
+
 if(@EXIV2_ENABLE_XMP@) # if(EXIV2_ENABLE_XMP)
   find_dependency(EXPAT REQUIRED)
 endif()
 
+if(@EXIV2_ENABLE_NLS@) # if(EXIV2_ENABLE_NLS)
+    find_dependency(Intl REQUIRED)
+endif()
+
+if(@EXV_HAVE_LIBICONV@) # if(EXV_HAVE_LIBICONV)
+    find_dependency(Iconv REQUIRED)
+endif()
+
 include("${CMAKE_CURRENT_LIST_DIR}/exiv2Export.cmake")
 
 check_required_components(exiv2)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -278,6 +278,9 @@ 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 PARENT_SCOPE)
+else()
+  set(EXV_HAVE_LIBICONV FALSE PARENT_SCOPE)
 endif()
 
 if(EXIV2_ENABLE_INIH)