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

The following commit has been merged in the master branch:
commit bac6b6e3324138c58ef49036372e7196e13962a4
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Feb 25 14:57:44 2015 +0000

    #1031  Thank You Daniel for the patch.  This submission is on the trunk.
---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9372d4..1d40de2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,7 @@ if( MSVC )
     endif()
     
     # link dependent libraries
+    FIND_PACKAGE(EXPAT QUIET)
     if ( NOT EXPAT_LIBRARY  )
         set(EXPAT_LIBRARY      ${CMAKE_SOURCE_DIR}/../${E}/$(ConfigurationName)/expat)
         set(EXPAT_INCLUDE_DIR  ${CMAKE_SOURCE_DIR}/../${E}/lib)
@@ -109,7 +110,7 @@ if( MSVC )
         include_directories( ${SSH_INCLUDE_DIR})
     endif()
     
-    # FIND_PACKAGE(ZLIB QUIET)
+    FIND_PACKAGE(ZLIB QUIET)
     if ( NOT ZLIB_FOUND )
         set(ZLIB_LIBRARY       ${CMAKE_SOURCE_DIR}/../${Z}/$(ConfigurationName)/zlib)
         set(ZLIB_INCLUDE_DIR   ${CMAKE_SOURCE_DIR}/../${Z})

-- 
exiv2 packaging