[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=6318d3d

The following commit has been merged in the master branch:
commit 6318d3d8060491e56331ec4a2de1c81e709373ac
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Oct 6 21:49:53 2012 +0000

    Fix.  Issue: #853.  More flexible way to detect and use existing Zlib libraries.  Thanks Daniel for providing this patch.
---
 CMakeLists.txt | 24 ++++++++++++++++--------
 README-CMAKE   |  6 ++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf8afc6..8509900 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,22 +70,30 @@ if( MSVC )
 		set(OUT_OF_SOURCE 1)
 	endif()
 	
+    # link dependent libraries
     if ( NOT EXPAT_LIBRARY  )
-		# link dependent libraries
     	if (OUT_OF_SOURCE)
     		set(EXPAT_LIBRARY      ../../../${E}/$(ConfigurationName)/expat)
-    		set(ZLIB_LIBRARY       ../../../${Z}/$(ConfigurationName)/zlib )
-    		set(EXPAT_INCLUDE_DIR  ../${E}/lib )
-    		set(ZLIB_INCLUDE_DIR   ../${Z}     )
+    		set(EXPAT_INCLUDE_DIR  ../${E}/lib)
 		else()
     		set(EXPAT_LIBRARY      ../../${E}/$(ConfigurationName)/expat)
-    		set(ZLIB_LIBRARY       ../../${Z}/$(ConfigurationName)/zlib)
-    		set(EXPAT_INCLUDE_DIR  ../${E}/lib )
-    		set(ZLIB_INCLUDE_DIR   ../${Z}     )
+    		set(EXPAT_INCLUDE_DIR  ../${E}/lib)
     	endif()
-    	include_directories( ${EXPAT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} msvc64\include src\include)
+    	include_directories( ${EXPAT_INCLUDE_DIR} msvc64\include src\include)
 	endif()
 	
+	FIND_PACKAGE(ZLIB QUIET)
+    if ( NOT ZLIB_FOUND )
+        if (OUT_OF_SOURCE)
+            set(ZLIB_LIBRARY       ../../../${Z}/$(ConfigurationName)/zlib )
+            set(ZLIB_INCLUDE_DIR   ../${Z})
+        else()
+            set(ZLIB_LIBRARY       ../../${Z}/$(ConfigurationName)/zlib)
+            set(ZLIB_INCLUDE_DIR   ../${Z})
+        endif()
+    endif()
+    include_directories(${ZLIB_INCLUDE_DIR})
+	
 	if ( EXIV2_ENABLE_SHARED )
 	    add_library(${E} SHARED IMPORTED)
 	    add_library(${Z} SHARED IMPORTED)
diff --git a/README-CMAKE b/README-CMAKE
index 820b6c9..d7ef9bf 100644
--- a/README-CMAKE
+++ b/README-CMAKE
@@ -214,6 +214,12 @@ Specify the location of the prebuilt libraries on the cmake command line:
 For example:
 cmake -G "NMake Makefiles" .. -DEXPAT_LIBRARY=%KDE4_INSTALL_DIR%/lib/libexpat.lib
 
+Daniel has provided a patch (SVN:2893) which enables you to specify a ZLIB search path:
+Example:
+   cmake.exe -G "Visual Studio 11 Win64" -DZLIB_ROOT=..\zlib-1.2.7-dev;..\zlib-1.2.7-dev\Release ...
+   
+If ZLIB is not located on the path provided, the normal default (..\zlib-1.2.7) will be used.
+
 ToDo: More information about parameters -DEXPAT_LIBRARTY -DZLIB_LIBRARY etc.
 
 4 Building and Installing for other users (Xcode, Eclipse, Qt)

-- 
exiv2 packaging