osgeo4w: support newer cmake versions

qgis · Jul 17, 2018 · 92f1fbef3d0a6517b8a0fc57a8d6d1201e9182d2 · 92f1fbe
1 parent 0d0adfe
commit 92f1fbef3d0a6517b8a0fc57a8d6d1201e9182d2
Unified Split

Showing with 6 additions and 2 deletions.

+3 −1 ms-windows/osgeo4w/package-nightly.cmd

+3 −1 ms-windows/osgeo4w/package.cmd
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -101,7 +101,9 @@ set GRASS7_VERSION=%GRASS7_VERSION:grass-=%
 set GRASS_VERSIONS=%GRASS6_VERSION% %GRASS7_VERSION%
 
 set PYTHONPATH=
-path %PF86%\CMake\bin;%PATH%;c:\cygwin\bin
+if exist "%PROGRAMFILES%\CMake\bin" path %PATH%;%PROGRAMFILES%\CMake\bin
+if exist "%PF86%\CMake\bin" path %PATH%;%PF86%\CMake\bin
+path %PATH%;c:\cygwin\bin
 
 PROMPT qgis%VERSION%$g 
 

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -97,7 +97,9 @@ set GRASS7_VERSION=%GRASS7_VERSION:grass-=%
 set GRASS_VERSIONS=%GRASS6_VERSION% %GRASS7_VERSION%
 
 set PYTHONPATH=
-path %PF86%\CMake\bin;%PATH%;c:\cygwin\bin
+if exist "%PROGRAMFILES%\CMake\bin" path %PATH%;%PROGRAMFILES%\CMake\bin
+if exist "%PF86%\CMake\bin" path %PATH%;%PF86%\CMake\bin
+path %PATH%;c:\cygwin\bin
 
 PROMPT qgis%VERSION%$g