Update vcpkg

Update vcpkg to be compatible with OSX
This commit is contained in:
Magne Sjaastad
2021-04-05 08:23:40 -07:00
committed by GitHub
parent eea2356459
commit 6e45d51e4e
3 changed files with 4 additions and 4 deletions

View File

@@ -134,14 +134,14 @@ jobs:
vcpkgArguments: '@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}'
vcpkgDirectory: '${{ github.workspace }}/ThirdParty/vcpkg'
# Ensure the cache key changes any time the content of the response file changes.
appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}
appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}-v01
- name: Cache dynamic version of OpenSSL (Linux)
if: "contains( matrix.config.os, 'ubuntu')"
uses: actions/cache@v2
with:
path: ${{ github.workspace }}/ThirdParty/vcpkg/installed/x64-linux-dynamic
key: ${{ matrix.config.os }}-vcpkg-x64-linux-dynamic_v01
key: ${{ matrix.config.os }}-vcpkg-x64-linux-dynamic_v04
- name: Install dynamic version of OpenSSL (Linux)
if: "contains( matrix.config.os, 'ubuntu')"

2
.gitmodules vendored
View File

@@ -3,4 +3,4 @@
url = https://github.com/CeetronSolutions/qwt.git
[submodule "ThirdParty/vcpkg"]
path = ThirdParty/vcpkg
url = https://github.com/microsoft/vcpkg
url = https://github.com/CeetronSolutions/vcpkg