diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-06-03 11:38:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 11:38:03 +0200 |
| commit | df1b0828252bc1eac1126b6273f322365ecceb7a (patch) | |
| tree | 039a93ef2c6ec23a4c3d64ea8b5a65f7d02289dc | |
| parent | b66798a8f3d559b5fe28c22973241e97d191a053 (diff) | |
| parent | b59fd03f1185c41015b25cbbf7a88a20825f8996 (diff) | |
| download | PROJ-df1b0828252bc1eac1126b6273f322365ecceb7a.tar.gz PROJ-df1b0828252bc1eac1126b6273f322365ecceb7a.zip | |
Merge pull request #2252 from rouault/workaround_appveyor_vs2015_issue
appveyor.yml: workaround vcpkg upstream build issue with VS2015
| -rw-r--r-- | appveyor.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/appveyor.yml b/appveyor.yml index 4e2b967d..dad1f35d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,9 +23,11 @@ cache: build_script: - set VCPKG_INSTALLED=C:\Tools\vcpkg\installed\%platform%-windows # If cached directory does not exist, update vcpkg and install dependencies + # The checkout of a precise sha1 for VS2015 is a workaround for https://github.com/microsoft/vcpkg/issues/11666 - if not exist %VCPKG_INSTALLED%\bin ( cd "C:\Tools\vcpkg" & git pull > nul & + (if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (git checkout a64dc07690bc8806e717e190f62eb58e198b599c)) & .\bootstrap-vcpkg.bat -disableMetrics & vcpkg install sqlite3[core,tool]:"%platform%"-windows & vcpkg install tiff:"%platform%"-windows & |