File tree Expand file tree Collapse file tree 3 files changed +5
-7
lines changed Expand file tree Collapse file tree 3 files changed +5
-7
lines changed Original file line number Diff line number Diff line change 46
46
shell : cmd
47
47
if : steps.cache.outputs.cache-hit != 'true'
48
48
run : |
49
- vcpkg install sqlite3[core,tool]:${{ env.ARCH }}-windows
50
- vcpkg install tiff:${{ env.ARCH }}-windows
51
- vcpkg install curl:${{ env.ARCH }}-windows
49
+ vcpkg install sqlite3[core,tool] tiff curl --triplet=${{ env.ARCH }}-windows
52
50
53
51
- name : Build
54
52
shell : cmd
Original file line number Diff line number Diff line change @@ -31,10 +31,10 @@ build_script:
31
31
# The checkout of a precise sha1 for VS2015 is a workaround for https://github.com/microsoft/vcpkg/issues/11666
32
32
- if not exist %VCPKG_INSTALLED%\bin (
33
33
cd "%VCPKG_ROOT%" &
34
- git fetch --depth=1 origin 2022 .04.12 &
34
+ git fetch --depth=1 origin 2023 .04.15 &
35
35
(if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (git -c advice.detachedHead=false checkout FETCH_HEAD)) &
36
36
.\bootstrap-vcpkg.bat -disableMetrics &
37
- vcpkg install curl sqlite3[core,tool] tiff &
37
+ vcpkg install sqlite3[core,tool] tiff curl --triplet=%platform%-windows &
38
38
cd %APPVEYOR_BUILD_FOLDER%
39
39
)
40
40
- dir %VCPKG_INSTALLED%\bin
Original file line number Diff line number Diff line change @@ -400,8 +400,8 @@ Install PROJ dependencies
400
400
401
401
::
402
402
403
- vcpkg.exe install sqlite3[core,tool]:x86-windows tiff:x86-windows curl: x86-windows
404
- vcpkg.exe install sqlite3[core,tool]:x64-windows tiff:x64-windows curl: x64-windows
403
+ vcpkg install sqlite3[core,tool] tiff curl --triplet= x86-windows
404
+ vcpkg install sqlite3[core,tool] tiff curl --triplet= x64-windows
405
405
406
406
.. note :: The tiff and curl dependencies are only needed since PROJ 7.0
407
407
You can’t perform that action at this time.
0 commit comments