Skip to content

Commit

Permalink
Switch back to exporting dep on EXPAT because it's needed for static …
Browse files Browse the repository at this point in the history
…libs

Signed-off-by: Ryan Friedman <[email protected]>
(cherry picked from commit 4dfb781)
  • Loading branch information
Ryanf55 authored and mergify[bot] committed Aug 2, 2023
1 parent 8bfee3d commit 143ac09
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions cmake/exiv2Config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ if(@EXIV2_ENABLE_PNG@) # if(EXIV2_ENABLE_PNG)
find_dependency(ZLIB REQUIRED)
endif()

if(@EXIV2_ENABLE_XMP@) # if(EXIV2_ENABLE_XMP)
find_dependency(EXPAT REQUIRED)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/exiv2Export.cmake")

check_required_components(exiv2)
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ target_include_directories(exiv2lib SYSTEM PRIVATE

if (EXIV2_ENABLE_XMP OR EXIV2_ENABLE_EXTERNAL_XMP)
target_include_directories(exiv2lib PRIVATE ${EXPAT_INCLUDE_DIR})
target_link_libraries(exiv2lib PRIVATE $<BUILD_INTERFACE:EXPAT::EXPAT>)
target_link_libraries(exiv2lib PRIVATE EXPAT::EXPAT)
list(APPEND requires_private_list "expat")
endif()

Expand Down

0 comments on commit 143ac09

Please sign in to comment.