File exiv2-rename-libxmp.patch of Package exiv2

Overview Repositories Revisions Requests Users Attributes Meta

File exiv2-rename-libxmp.patch of Package exiv2 (Revision 6718573afc90084a713af4a5f1ba69a7)

Currently displaying revision 6718573afc90084a713af4a5f1ba69a7 , Show latest

From 89509d7a3915ba474cbc3f8c85ab9bec4954ceda Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 2 Jan 2019 10:38:22 +0100
Subject: [PATCH] cmake: Rename xmp to exiv2-xmp to avoid name conflicts

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>
---
 src/CMakeLists.txt    |  2 +-
 xmpsdk/CMakeLists.txt | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index adb285b1..2aeae733 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -147,7 +147,7 @@ target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR})
 target_include_directories(exiv2lib PRIVATE ${ZLIB_INCLUDE_DIR})
 
 if (EXIV2_ENABLE_XMP)
-    target_link_libraries(exiv2lib PUBLIC xmp)
+    target_link_libraries(exiv2lib PUBLIC exiv2-xmp)
 elseif(EXIV2_ENABLE_EXTERNAL_XMP)
     target_link_libraries(exiv2lib PUBLIC ${XMPSDK_LIBRARY})
     target_include_directories(exiv2lib PUBLIC ${XMPSDK_INCLUDE_DIR})
diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
index a4c1fe6c..fa521043 100644
--- a/xmpsdk/CMakeLists.txt
+++ b/xmpsdk/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(xmp STATIC
+add_library(exiv2-xmp STATIC
     src/ExpatAdapter.cpp
     src/MD5.cpp
     src/ParseRDF.cpp
@@ -26,12 +26,12 @@ add_library(xmp STATIC
     include/XMP_Version.h
 )
 
-target_link_libraries(xmp 
+target_link_libraries(exiv2-xmp
     PRIVATE 
         ${EXPAT_LIBRARY}
 )
 
-target_include_directories(xmp
+target_include_directories(exiv2-xmp
     PUBLIC 
         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>
     PRIVATE 
@@ -39,20 +39,20 @@ target_include_directories(xmp
 )
 
 if (MSVC)
-    target_compile_definitions(xmp PRIVATE XML_STATIC)
+    target_compile_definitions(exiv2-xmp PRIVATE XML_STATIC)
 endif()
 
 check_include_file( "stdint.h"  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()
 
 if (BUILD_SHARED_LIBS)
-    set_property(TARGET xmp PROPERTY POSITION_INDEPENDENT_CODE ON)
+    set_property(TARGET exiv2-xmp PROPERTY POSITION_INDEPENDENT_CODE ON)
 endif()
 
 # 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}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
-- 
2.20.1

Places

File exiv2-rename-libxmp.patch of Package exiv2 (Revision 6718573afc90084a713af4a5f1ba69a7)

Places