osgeo4w: fix quazip support

qgis · Apr 19, 2012 · f7c6b62 · f7c6b62 · etiennesky · Apr 25, 2012
1 parent e5d97f5
commit f7c6b62
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -271,7 +271,7 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
 # if WIN32 should use zlib from QT
 FIND_PACKAGE(ZLIB)
 IF (ZLIB_FOUND)
-  MESSAGE(STATUS "Found zlib: ${ZLIB_LIBRARIES}")
+  MESSAGE(STATUS "Found zlib: ${ZLIB_LIBRARY}")
   SET(HAVE_ZLIB TRUE)
 ELSE (ZLIB_FOUND)
   MESSAGE(STATUS "Could not find zlib (optional)")

diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -111,6 +111,8 @@ cmake -G "Visual Studio 9 2008" ^
 	-D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib ^
 	-D QWT_INCLUDE_DIR=%O4W_ROOT%/include/qwt ^
 	-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
+	-D ZLIB_INCLUDE_DIR=%O4W_ROOT%/include ^
+	-D ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^
 	-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
 	-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
 	-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -109,6 +109,8 @@ cmake -G "Visual Studio 9 2008" ^
 	-D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib ^
 	-D QWT_INCLUDE_DIR=%O4W_ROOT%/include/qwt ^
 	-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
+	-D ZLIB_INCLUDE_DIR=%O4W_ROOT%/include ^
+	-D ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^
 	-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
 	-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
 	-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -178,6 +178,8 @@ SET(QGIS_CORE_SRCS
 )
 
 IF(HAVE_ZLIB)
+  ADD_DEFINITIONS(-DQUAZIP_BUILD)
+
   SET(QGIS_CORE_SRCS
     ${QGIS_CORE_SRCS}
     quazip/unzip.c