sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

osgeo4w: fix quazip support

Browse Source
This commit is contained in:
Juergen E. Fischer 2012-04-19 07:18:38 +02:00
parent e5d97f53e2
commit f7c6b62cc5
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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)")

2
ms-windows/osgeo4w/package-nightly.cmd
View File

@ -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 ^

2
ms-windows/osgeo4w/package.cmd
View File

@ -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 ^

2
src/core/CMakeLists.txt
View File

@ -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