[QGIS Commit] r13913 - trunk/qgis/ms-windows/osgeo4w

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-07-12 18:56:43 +0000 (Mon, 12 Jul 2010)
New Revision: 13913

Modified:
   trunk/qgis/ms-windows/osgeo4w/package.cmd
   trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl
Log:
update osgeo4w build to use GDAL 1.7

Modified: trunk/qgis/ms-windows/osgeo4w/package.cmd
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/package.cmd	2010-07-12 15:45:42 UTC (rev 13912)
+++ trunk/qgis/ms-windows/osgeo4w/package.cmd	2010-07-12 18:56:43 UTC (rev 13913)
@@ -89,8 +89,8 @@
 	-D WITH_INTERNAL_SPATIALITE=TRUE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
-	-D GDAL_INCLUDE_DIR=%O4W_ROOT%/apps/gdal-16/include ^
-	-D GDAL_LIBRARY=%O4W_ROOT%/apps/gdal-16/lib/gdal_i.lib ^
+	-D GDAL_INCLUDE_DIR=%O4W_ROOT%/apps/gdal-17/include ^
+	-D GDAL_LIBRARY=%O4W_ROOT%/apps/gdal-17/lib/gdal_i.lib ^
 	-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
 	-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python25/include ^
 	-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python25/libs/python25.lib ^

Modified: trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl	2010-07-12 15:45:42 UTC (rev 13912)
+++ trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl	2010-07-12 18:56:43 UTC (rev 13913)
@@ -2,7 +2,7 @@
 
 SET OSGEO4W_ROOT=@osgeo4w@
 call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
-call "%OSGEO4W_ROOT%"\bin\gdal16.bat
+call "%OSGEO4W_ROOT%"\bin\gdal17.bat
 @echo off
 path %PATH%;%GISBASE%\bin
 start "Quantum GIS" /B "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.exe %*