third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove exiv2-xmp from CMake exported config

Browse Source
This commit is contained in:
Miloš Komarčević 2023-05-16 14:17:51 +02:00 committed by Rosen Penev
parent 972795741b
commit c04dcc8341
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -188,7 +188,7 @@ if (EXIV2_ENABLE_XMP OR EXIV2_ENABLE_EXTERNAL_XMP)
endif() endif()
if (EXIV2_ENABLE_XMP) if (EXIV2_ENABLE_XMP)
target_link_libraries(exiv2lib PRIVATE exiv2-xmp) target_sources(exiv2lib PRIVATE $<TARGET_OBJECTS:exiv2-xmp>)
elseif(EXIV2_ENABLE_EXTERNAL_XMP) elseif(EXIV2_ENABLE_EXTERNAL_XMP)
target_link_libraries(exiv2lib PUBLIC ${XMPSDK_LIBRARY}) target_link_libraries(exiv2lib PUBLIC ${XMPSDK_LIBRARY})
target_include_directories(exiv2lib PUBLIC ${XMPSDK_INCLUDE_DIR}) target_include_directories(exiv2lib PUBLIC ${XMPSDK_INCLUDE_DIR})

17
xmpsdk/CMakeLists.txt
View File

@ -26,14 +26,10 @@ add_library(exiv2-xmp OBJECT
include/XMP_Version.h include/XMP_Version.h
) )
target_link_libraries(exiv2-xmp
PRIVATE
EXPAT::EXPAT
)
target_include_directories(exiv2-xmp SYSTEM target_include_directories(exiv2-xmp SYSTEM
PRIVATE PRIVATE
${PROJECT_SOURCE_DIR}/xmpsdk/include ${PROJECT_SOURCE_DIR}/xmpsdk/include
${EXPAT_INCLUDE_DIRS}
) )
# Prevent a denial-service-attack related to XML entity expansion # Prevent a denial-service-attack related to XML entity expansion
@ -41,7 +37,7 @@ target_include_directories(exiv2-xmp SYSTEM
# See https://bugzilla.redhat.com/show_bug.cgi?id=888769 # See https://bugzilla.redhat.com/show_bug.cgi?id=888769
target_compile_definitions(exiv2-xmp PRIVATE BanAllEntityUsage=1) target_compile_definitions(exiv2-xmp PRIVATE BanAllEntityUsage=1)
if (MSVC) if (WIN32)
target_compile_definitions(exiv2-xmp PRIVATE XML_STATIC) target_compile_definitions(exiv2-xmp PRIVATE XML_STATIC)
endif() endif()
@ -53,10 +49,3 @@ endif()
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
set_property(TARGET exiv2-xmp PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET exiv2-xmp PROPERTY POSITION_INDEPENDENT_CODE ON)
endif() endif()
# The private dependencies of a static library still need to be exported because they are needed to properly link the consumers of the static library.
install(TARGETS exiv2-xmp EXPORT exiv2Config
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)