diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-07-19 11:52:15 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-07-19 11:52:15 +0200 |
commit | 9c95a92d0cc7aeea3d9dd37318544638600ef1b0 (patch) | |
tree | 71ca827e5f7eb8182c39aed586a6bc4ad1072fd9 /.github | |
parent | adf0bae3b49025641ed6fa7cca715269db5c7f6d (diff) | |
download | ATCD-9c95a92d0cc7aeea3d9dd37318544638600ef1b0.tar.gz |
Set VCPKG_INSTALLED_DIR
* .github/workflows/windows.yml:
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/windows.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 797d129260c..239445ff28c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -115,6 +115,7 @@ jobs: ZLIB_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include ZLIB_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkgarch }} + VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg steps: - name: checkout ACE/TAO uses: actions/checkout@v3 @@ -127,7 +128,7 @@ jobs: uses: lukka/run-vcpkg@v10 with: vcpkgGitCommitId: cef0b3ec767df6e83806899fe9525f6cf8d7bc91 - runVcpkgFormatString: '[`install`, `--recurse`, `--clean-after-build`, `--triplet`, `${{ env.VCPKG_DEFAULT_TRIPLET }}`, `${{ matrix.vcpkgpackages }}`]' + runVcpkgFormatString: '[`install`, `--recurse`, `--clean-after-build`, `--x-install-root`, `${{ env.VCPKG_INSTALLED_DIR }}`, `--triplet`, `${{ env.VCPKG_DEFAULT_TRIPLET }}`, `${{ matrix.vcpkgpackages }}`]' appendedCacheKey: ${{ matrix.name }} runVcpkgInstall: true - name: create $ACE_ROOT/ace/config.h |