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

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

    Moving Daniel's build scripts to contrib
---
 {build => contrib/build}/msvc/build.cmd  |  0
 {build => contrib/build}/msvc/setenv.cmd |  0
 src/CMakeLists.txt                       | 20 ++++++++++++++++----
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/build/msvc/build.cmd b/contrib/build/msvc/build.cmd
similarity index 100%
rename from build/msvc/build.cmd
rename to contrib/build/msvc/build.cmd
diff --git a/build/msvc/setenv.cmd b/contrib/build/msvc/setenv.cmd
similarity index 100%
rename from build/msvc/setenv.cmd
rename to contrib/build/msvc/setenv.cmd
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b970e1..7484fb9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -269,10 +269,22 @@ IF( EXIV2_ENABLE_PNG )
     IF( ZLIB_FOUND )
         IF( MSVC )
             if ( EXIV2_ENABLE_SHARED )
-                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()
+				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} )
         ELSE()
             TARGET_LINK_LIBRARIES( exiv2lib ${ZLIB_LIBRARIES} )
         ENDIF()

-- 
exiv2 packaging