Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Export more dependencies in CMake config (backport #3094) #3095

Merged
merged 1 commit into from
Jan 4, 2025
Merged

Export more dependencies in CMake config (backport #3094) #3095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions cmake/exiv2Config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,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 )
Expand Down
Loading