diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-07-19 12:21:38 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-07-19 12:21:38 +0200 |
commit | cbedceeb2e8d88622fbbf9699a68fb0adaef1576 (patch) | |
tree | bf217dfd7c8307c020668bd6a3d334c77bfdfbf5 /.github/workflows | |
parent | 574e5f45ff785c016d13f92346a120f7977bf12c (diff) | |
download | ATCD-cbedceeb2e8d88622fbbf9699a68fb0adaef1576.tar.gz |
Single line vcpkg.json and updated wchar xercesc feature
* .github/workflows/windows.yml:
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/windows.yml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7ae0cf6b778..04821ead579 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -24,7 +24,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: '"openssl", "xerces-c[xmlch-wchar]", "zlib"' + vcpkgpackages: '"openssl", {"name": "xerces-c", "features": ["xmlch-wchar"]}, "zlib"' OptionalFeatures: uses_wchar=1 - name: VS2019Debug64 vmimage: windows-2019 @@ -83,7 +83,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: '"openssl", "xerces-c[xmlch-wchar]", "zlib"' + vcpkgpackages: '"openssl", {"name": "xerces-c", "features": ["xmlch-wchar"]}, "zlib"' OptionalFeatures: uses_wchar=1 - name: VS2022Debug64 vmimage: windows-2022 @@ -126,11 +126,7 @@ jobs: path: ${{ env.MPC_ROOT }} - name: create vcpkg.json run: | - '{' > vcpkg.json - ' "name": "tao",' >> vcpkg.json - ' "version-string": "githubaction",' >> vcpkg.json - ' "dependencies": [ ${{ matrix.vcpkgpackages }} ]' >> vcpkg.json - '}' >> vcpkg.json + '{"name": "tao","version-string": "githubaction","dependencies": [ ${{ matrix.vcpkgpackages }} ]''}' > vcpkg.json shell: pwsh - name: Install vcpkg uses: lukka/run-vcpkg@v10 |