From d4ec76fa62303760d4c920f156afdf68d4f47441 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Sat, 26 Sep 2015 10:51:56 +0000
Subject: [PATCH] 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(-)
 rename {build => contrib/build}/msvc/build.cmd (100%)
 rename {build => contrib/build}/msvc/setenv.cmd (100%)

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 7b970e13..7484fb92 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()