[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=83c25ef

The following commit has been merged in the master branch:
commit 83c25ef27455623591c3fd4329f54540ca6cd20e
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Oct 6 22:11:55 2012 +0000

    Fix.  Issue: #852.  libxmp should not be linked with expat.  Thanks Daniel for providing the patch.
---
 xmpsdk/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
index 28780ee..f7141d9 100644
--- a/xmpsdk/CMakeLists.txt
+++ b/xmpsdk/CMakeLists.txt
@@ -14,15 +14,15 @@ FOREACH(_currentfile ${XMPSRC})
     IF(NOT MSVC AND NOT CYGWIN AND NOT MSYS)
         SET_SOURCE_FILES_PROPERTIES(${_currentfile} PROPERTIES COMPILE_FLAGS "-fPIC")
     ENDIF(NOT MSVC AND NOT CYGWIN AND NOT MSYS)
-ENDFOREACH(_currentfile ${XMPSRC})
+ENDFOREACH()
 
 IF( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
-    ADD_LIBRARY( xmp STATIC ${XMPSRC} ${EXPAT_LIBRARIES} )
+    ADD_LIBRARY( xmp STATIC ${XMPSRC} )
     GET_TARGET_PROPERTY( XMPLIB xmp LOCATION )
     TARGET_LINK_LIBRARIES(xmp ${EXPAT_LIBRARIES})
     # SET( XMPLIB ${XMPLIB} PARENT_SCOPE )
     # INSTALL(TARGETS xmp ${INSTALL_TARGET_STANDARD_ARGS} )
-ENDIF( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
+ENDIF()
 
 # That's all Folks!
 ##

-- 
exiv2 packaging