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

cmake: Rename xmp to exiv2-xmp to avoid name conflicts

Browse Source 
There is already a libxmp file by the xmp project on https://xmp.sf.net.
To avoid issues prefix with exiv2.

Fixes #624

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 89509d7a3915ba474cbc3f8c85ab9bec4954ceda)
This commit is contained in:
Andreas Schneider 2019-01-02 10:38:22 +01:00
parent 661e3fa4bf
commit 6062b1b803
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -147,7 +147,7 @@ target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR})
target_include_directories(exiv2lib PRIVATE ${ZLIB_INCLUDE_DIR}) target_include_directories(exiv2lib PRIVATE ${ZLIB_INCLUDE_DIR})
if (EXIV2_ENABLE_XMP) if (EXIV2_ENABLE_XMP)
target_link_libraries(exiv2lib PUBLIC xmp) target_link_libraries(exiv2lib PUBLIC 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})

14
xmpsdk/CMakeLists.txt
View File

@ -1,4 +1,4 @@
add_library(xmp STATIC add_library(exiv2-xmp STATIC
src/ExpatAdapter.cpp src/ExpatAdapter.cpp
src/MD5.cpp src/MD5.cpp
src/ParseRDF.cpp src/ParseRDF.cpp
@ -26,12 +26,12 @@ add_library(xmp STATIC
include/XMP_Version.h include/XMP_Version.h
) )
target_link_libraries(xmp target_link_libraries(exiv2-xmp
PRIVATE PRIVATE
${EXPAT_LIBRARY} ${EXPAT_LIBRARY}
) )
target_include_directories(xmp target_include_directories(exiv2-xmp
PUBLIC PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>
PRIVATE PRIVATE
@ -39,20 +39,20 @@ target_include_directories(xmp
) )
if (MSVC) if (MSVC)
target_compile_definitions(xmp PRIVATE XML_STATIC) target_compile_definitions(exiv2-xmp PRIVATE XML_STATIC)
endif() endif()
check_include_file( "stdint.h" EXV_HAVE_STDINT_H ) check_include_file( "stdint.h" EXV_HAVE_STDINT_H )
if (EXV_HAVE_STDINT_H) if (EXV_HAVE_STDINT_H)
target_compile_definitions(xmp PRIVATE EXV_HAVE_STDINT_H) target_compile_definitions(exiv2-xmp PRIVATE EXV_HAVE_STDINT_H)
endif() endif()
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
set_property(TARGET 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) # 1119 Install libxmp.a for use by third party applications (Thanks, Emmanuel)
install(TARGETS 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}
) )