Hide exiv2-xmp dependency in CMake config file:

main
Luis Díaz Más 5 years ago
parent 59e18266a4
commit 8dc42199e8

@ -144,7 +144,10 @@ set_target_properties( exiv2lib_int PROPERTIES
) )
target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR}) target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR})
target_include_directories(exiv2lib PRIVATE ${ZLIB_INCLUDE_DIR}) target_include_directories(exiv2lib PRIVATE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>
${ZLIB_INCLUDE_DIR}
)
if (EXIV2_ENABLE_XMP) if (EXIV2_ENABLE_XMP)
target_link_libraries(exiv2lib PRIVATE exiv2-xmp) target_link_libraries(exiv2lib PRIVATE exiv2-xmp)

@ -28,13 +28,12 @@ add_library(exiv2-xmp STATIC
target_link_libraries(exiv2-xmp target_link_libraries(exiv2-xmp
PRIVATE PRIVATE
${EXPAT_LIBRARY} $<BUILD_INTERFACE:${EXPAT_LIBRARY}>
) )
target_include_directories(exiv2-xmp target_include_directories(exiv2-xmp
PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>
PRIVATE PRIVATE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>
${EXPAT_INCLUDE_DIR} ${EXPAT_INCLUDE_DIR}
) )
@ -50,8 +49,9 @@ 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()
# 1119 Install libxmp.a for use by third party applications (Thanks, Emmanuel) # 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 install(TARGETS exiv2-xmp EXPORT exiv2Config
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
) )

Loading…
Cancel
Save