Skip to content

CMake: Fix Expat Detection #12500

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

Closed
wants to merge 1 commit into from
Closed

CMake: Fix Expat Detection #12500

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
10 changes: 7 additions & 3 deletions src/AnalyzeView/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,22 @@ CPMAddPackage(
"EXPAT_SHARED_LIBS OFF"
)

if(TARGET EXPAT::EXPAT)
if(TARGET expat::expat)
set(_EXIV2_ENABLE_XMP ON)
add_library(EXPAT::EXPAT INTERFACE IMPORTED)
set_target_properties(EXPAT::EXPAT PROPERTIES INTERFACE_LINK_LIBRARIES expat::expat)
else()
set(_EXIV2_ENABLE_XMP OFF)
endif()

message(STATUS "_EXIV2_ENABLE_XMP ${_EXIV2_ENABLE_XMP}")

CPMAddPackage(
NAME exiv2
VERSION 0.28.4
VERSION 0.28.5
GITHUB_REPOSITORY Exiv2/exiv2
OPTIONS
"BUILD_SHARED_LIBS OFF"
"EXIV2_ENABLE_XMP ${_EXIV2_ENABLE_XMP}"
"EXIV2_ENABLE_EXTERNAL_XMP OFF"
"EXIV2_ENABLE_PNG OFF"
Expand All @@ -147,7 +152,6 @@ CPMAddPackage(
"EXIV2_BUILD_FUZZ_TESTS OFF"
"EXIV2_BUILD_DOC OFF"
"BUILD_WITH_CCACHE OFF"
"BUILD_SHARED_LIBS OFF"
)

if(TARGET Exiv2::exiv2lib)
Expand Down
Loading