diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-11-17 08:28:21 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-11-17 08:28:21 +0100 |
| commit | 1705a4e02bcd74b838e9e1ca21c70378a6eb7589 (patch) | |
| tree | cbec6ec44c1fe19b4b7609c714f47cc09f391f26 /.github | |
| parent | dd3081420d79097bd639f300448c63c5d52acc81 (diff) | |
| download | MPC-1705a4e02bcd74b838e9e1ca21c70378a6eb7589.tar.gz | |
Make sure we enable C++11 because it is now mandatory for ACE/TAO
* .github/workflows/macosx.yml:
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/macosx.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index 1de35d04..28ef62e0 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -10,11 +10,12 @@ jobs: build: strategy: matrix: + cxxstd: ["11"] + os: [macos-10.15, macos-11.0] include: - - os: macos-10.15 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU + - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU runs-on: ${{ matrix.os }} - name: "${{ matrix.os }}" + name: "${{ matrix.os }}-C++${{ matrix.cxxstd }}" env: DOC_ROOT: ${{ github.workspace }}/ACE_TAO ACE_ROOT: ${{ github.workspace }}/ACE_TAO/ACE @@ -32,6 +33,10 @@ jobs: run: | '#include "ace/config-macosx.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh + - name: Add c++${{ matrix.cxxstd }} platform_macros.GNU + run: | + 'c++${{ matrix.cxxstd }}=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + shell: pwsh - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU run: | '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU |