preset python include path correctly for osgeo4w build

git-svn-id: http://svn.osgeo.org/qgis/trunk@11330 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 10, 2009 · 5eb0467 · 5eb0467
1 parent 5859440
commit 5eb0467
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -17,6 +17,8 @@ set BISON=%PROGRAMFILES%\GnuWin32\bin\bison.exe
 
 set VERSION=%1
 set PACKAGE=%2
+if %VERSION%=="" goto error
+if %PACKAGE%=="" goto error
 
 PROMPT qgis%VERSION%$g 
 
@@ -76,7 +78,8 @@ cmake -G "Visual Studio 9 2008" ^
 	-D BISON_EXECUTABLE=%BISON% ^
 	-D GDAL_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\gdal-16\include -D GDAL_LIBRARY=%OSGEO4W_ROOT%\apps\gdal-16\lib\gdal_i.lib ^
 	-D PYTHON_EXECUTABLE=%OSGEO4W_ROOT%\bin\python.exe ^
-	-D PYTHON_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Python25\include -D PYTHON_LIBRARY=%OSGEO4W_ROOT%\apps\Python25\libs\python25.lib ^
+	-D PYTHON_INCLUDE_PATH=%OSGEO4W_ROOT%\apps\Python25\include ^
+	-D PYTHON_LIBRARY=%OSGEO4W_ROOT%\apps\Python25\libs\python25.lib ^
 	-D SIP_BINARY_PATH=%OSGEO4W_ROOT%\apps\Python25\sip.exe ^
 	-D GRASS_PREFIX=%OSGEO4W_ROOT%\apps\grass\grass-%GRASS_VERSION% ^
 	-D QT_BINARY_DIR=%OSGEO4W_ROOT%\bin -D QT_LIBRARY_DIR=%OSGEO4W_ROOT%\lib ^
@@ -87,6 +90,9 @@ cmake -G "Visual Studio 9 2008" ^
 	../../..>>%LOG% 2>&1
 if errorlevel 1 goto error
 
+egrep -vq "^(Python not being built|Could not find GRASS)" %LOG%
+if errorlevel 1 goto error
+
 :skipcmake
 
 echo ZERO_CHECK: %DATE% %TIME%>>%LOG% 2>&1