[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=ea82638

The following commit has been merged in the master branch:
commit ea82638b9c3571043fad53c6bcdc2febd58290f6
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Sep 26 10:53:10 2015 +0000

    Correction to r3968
---
 src/CMakeLists.txt | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7484fb9..7b970e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -269,22 +269,10 @@ IF( EXIV2_ENABLE_PNG )
     IF( ZLIB_FOUND )
         IF( MSVC )
             if ( EXIV2_ENABLE_SHARED )
-				set(ZLIB_OPTIM,${ZLIB_LIBRARIES})
-				set(ZLIB_DEBUG,${ZLIB_LIBRARIES}d)
-			else()
-				set(ZLIB_OPTIM,zlibstatic)
-				set(ZLIB_DEBUG,zlibstaticd.lib)
-			endif()
-
-			# 1041 - add .lib if necessary
-			if ( NOT "${ZLIB_OPTIM}"  MATCHES "\.lib$") )
-				set(ZLIB_OPTIM,${ZLIB_OPTIM}.lib)
-			endif()
-			if ( NOT "${ZLIB_DEBUG}" MATCHES "\.lib$") )
-				set(ZLIB_DEBUG,${ZLIB_DEBUG}.lib)
-			endif()
-
-            TARGET_LINK_LIBRARIES( exiv2lib ${ZLIB_OPTIM} debug ${ZLIB_DEBUG} )
+                TARGET_LINK_LIBRARIES( exiv2lib optimized ${ZLIB_LIBRARIES}.lib debug ${ZLIB_LIBRARIES}d.lib )
+            else()
+                TARGET_LINK_LIBRARIES( exiv2lib optimized zlibstatic.lib debug zlibstaticd.lib )
+            endif()
         ELSE()
             TARGET_LINK_LIBRARIES( exiv2lib ${ZLIB_LIBRARIES} )
         ENDIF()

-- 
exiv2 packaging