Skip to content
Permalink
Browse files

osgeo4w: also look for GRASS 7.6

(cherry picked from commit 4048d37)
  • Loading branch information
jef-n committed Jan 22, 2019
1 parent a2cb07e commit 73c31df831ce42e61cb7b1f7633b8ed16cb85029
Showing with 2 additions and 2 deletions.
  1. +1 −1 ms-windows/osgeo4w/msvc-env.bat
  2. +1 −1 ms-windows/osgeo4w/package.cmd
@@ -43,8 +43,8 @@ call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %VCARCH%
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin

set GRASS7=
if exist %OSGEO4W_ROOT%\bin\grass72.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass72.bat
if exist %OSGEO4W_ROOT%\bin\grass74.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass74.bat
if exist %OSGEO4W_ROOT%\bin\grass76.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass76.bat
if "%GRASS7%"=="" (echo GRASS7 not found & goto error)
for /f "usebackq tokens=1" %%a in (`%GRASS7% --config path`) do set GRASS_PREFIX=%%a

@@ -64,8 +64,8 @@ set CMAKE_OPT=^

:cmake
set GRASS7=
if exist %OSGEO4W_ROOT%\bin\grass72.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass72.bat
if exist %OSGEO4W_ROOT%\bin\grass74.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass74.bat
if exist %OSGEO4W_ROOT%\bin\grass76.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass76.bat
if "%GRASS7%"=="" (echo GRASS7 not found & goto error)

for /f "usebackq tokens=1" %%a in (`%GRASS7% --config path`) do set GRASS7_PATH=%%a

0 comments on commit 73c31df

Please sign in to comment.
You can’t perform that action at this time.