Use manifest mode of vcpkg

This commit is contained in:
Hiroshi SHIBATA 2024-06-24 08:38:42 +09:00
parent 18404af9ec
commit 5f5da2e839

View file

@ -104,12 +104,6 @@ jobs:
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
- name: Install libraries with vcpkg
run: |
vcpkg --triplet x64-windows install gmp libffi libyaml openssl zlib
env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
- name: Install libraries with scoop - name: Install libraries with scoop
run: | run: |
iex "& {$(irm get.scoop.sh)} -RunAsAdmin" iex "& {$(irm get.scoop.sh)} -RunAsAdmin"
@ -151,9 +145,16 @@ jobs:
- name: compiler version - name: compiler version
run: cl run: cl
- name: Install libraries with vcpkg
run: |
vcpkg install --triplet x64-windows
working-directory: src
env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
- name: link libraries - name: link libraries
run: | run: |
for %%I in (C:\vcpkg\installed\x64-windows\bin\*.dll) do ( for %%I in (..\src\vcpkg_installed\x64-windows\bin\*.dll) do (
if not %%~nI == readline mklink %%~nxI %%I if not %%~nI == readline mklink %%~nxI %%I
) )
# We use OpenSSL instealled by vcpkg instead # We use OpenSSL instealled by vcpkg instead
@ -168,7 +169,7 @@ jobs:
- name: Configure - name: Configure
run: >- run: >-
../src/win32/configure.bat --disable-install-doc ../src/win32/configure.bat --disable-install-doc
--with-opt-dir=C:/vcpkg/installed/x64-windows --with-opt-dir=../src/vcpkg_installed/x64-windows
- run: nmake incs - run: nmake incs