diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-15 18:14:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 18:14:23 +0100 |
| commit | f38ef549831277da3af7d2b36d584ec1ef5459c5 (patch) | |
| tree | 096c1ec2adbb41dcc9556771a97624b1224b3a05 /.github | |
| parent | 7d5b465c5009b7efc82266aeb5426261350888ed (diff) | |
| parent | 0b03e1dd5c42e2e292dde6968fdaa735f3028093 (diff) | |
| download | MPC-f38ef549831277da3af7d2b36d584ec1ef5459c5.tar.gz | |
Merge pull request #128 from jwillemsen/jwi-zlib
Test and support zlib on windows
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ad73c05f..751f3af5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -51,6 +51,7 @@ jobs: 'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU 'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU 'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + 'zlib=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU shell: pwsh - name: add optional optional macros run: | @@ -66,6 +67,7 @@ jobs: 'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features 'xerces3=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features 'ssl=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + 'zlib=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features shell: pwsh - name: add optional optional feature run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 02bf8af2..a519ffe8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,7 +18,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c + vcpkgpackages: openssl xerces-c zlib - name: VS2019Debug64 vmimage: windows-2019 mpctype: vs2019 @@ -26,7 +26,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c + vcpkgpackages: openssl xerces-c zlib - name: VS2019Release32 vmimage: windows-2019 mpctype: vs2019 @@ -34,7 +34,7 @@ jobs: BuildConfiguration: Release vcpkgarch: x86-windows vcpkglibdir: lib - vcpkgpackages: openssl xerces-c + vcpkgpackages: openssl xerces-c zlib runs-on: ${{ matrix.vmimage }} name: ${{ matrix.name }} env: @@ -47,6 +47,8 @@ jobs: XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} SSL_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include SSL_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} + ZLIB_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include + ZLIB_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} steps: - name: checkout MPC uses: actions/checkout@v2 @@ -58,7 +60,7 @@ jobs: - name: Install vcpkg uses: lukka/run-vcpkg@v7 with: - vcpkgGitCommitId: 0bf3923f9fab4001c00f0f429682a0853b5749e0 + vcpkgGitCommitId: 75522bb1f2e7d863078bcd06322348f053a9e33f vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }} vcpkgTriplet: ${{ matrix.vcpkgarch }} appendedCacheKey: ${{ matrix.name }} @@ -73,6 +75,7 @@ jobs: echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features echo "openssl11=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + echo "zlib=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features shell: pwsh - name: Add optional features ${{ matrix.OptionalFeatures }} run: | |