osgeo4w: fix quazip support

jef-n · jef-n · commit f7c6b62cc59b · 2012-04-19T07:18:38.000+02:00
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  

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,8 @@ SET(QGIS_CORE_SRCS`
`178`	`178`	`)`
`179`	`179`
`180`	`180`	`IF(HAVE_ZLIB)`
	`181`	`+ ADD_DEFINITIONS(-DQUAZIP_BUILD)`
	`182`	`+`
`181`	`183`	`SET(QGIS_CORE_SRCS`
`182`	`184`	`${QGIS_CORE_SRCS}`
`183`	`185`	`quazip/unzip.c`