6 Commits

Author SHA1 Message Date
Cody Martin
24f883a556 Revert "Add gdal+proj libraries to PATH in MSVC environment setup script"
This reverts commit b8c803fc7e2b7fa958247d27777f6c4d53c4e136.
2020-05-11 17:00:40 +02:00
Cody Martin
4daabcbaa5 Add gdal+proj libraries to PATH in MSVC environment setup script
More specifically: call gdal-dev-env.bat as part of msvc-env.bat.

Without doing this, the a build of the qgis.sln file in MSVC fails.
Specifically, the synccrsdb project fails with:

  #>  Running crssync
  #>C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(171,5): error MSB6006: "cmd.exe" exited with code -1073741515.

Running crssync.exe from the command line also fails:

  C:\OSGeo4W64>QGIS>ms-windows\osgeo4w\build-qgis-test-x86_64\output\bin\RelWithDebInfo\crssync.exe
  The code execution cannot proceed because gdal302.dll was not found. Reinstalling the program may fix this problem.
  The code execution cannot proceed because proj_7_1.dll was not found. Reinstalling the program may fix this problem.
  The code execution cannot proceed because gdal302.dll was not found. Reinstalling the program may fix this problem.

With this change, the configonly.bat workflow produces a qgis.sln
file that builds to completion.

The package-nightly.cmd script already called this additional .bat
file to set up the PATH to gdal and proj libraries:

  call msvc-env.bat %ARCH%
  call gdal-dev-env.bat

So it makes sense to add this call into msvc-env.bat.
2020-05-11 17:00:40 +02:00
Juergen E. Fischer
d33a5b56a9 azure-pipelines support
(blood, sweat and tears w/squ-ashed away)
2019-11-30 20:34:16 +01:00
Juergen E. Fischer
c86ed789bf osgeo4w: detect grass78 2019-11-02 10:04:20 +01:00
Juergen E. Fischer
4048d37a46 osgeo4w: also look for GRASS 7.6 2019-01-22 17:40:14 +01:00
Juergen E. Fischer
4790747aea Tune osgeo4w scripts (followup cab6a4b6) 2018-06-20 10:01:34 +02:00