mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Update vcpkg
Update vcpkg to be compatible with OSX
This commit is contained in:
4
.github/workflows/ResInsightWithCache.yml
vendored
4
.github/workflows/ResInsightWithCache.yml
vendored
@@ -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
2
.gitmodules
vendored
@@ -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
|
||||
|
2
ThirdParty/vcpkg
vendored
2
ThirdParty/vcpkg
vendored
Submodule ThirdParty/vcpkg updated: 56fffbe49d...d9a0634166
Reference in New Issue
Block a user