Skip to content

Commit

Permalink
Merge pull request #16 from neosmart/ci-no-wfmo
Browse files Browse the repository at this point in the history
Add Linux CI run w/out WFMO defined

[ci skip]
  • Loading branch information
mqudsi authored Feb 23, 2021
2 parents 4861ce9 + 6ca89fc commit 42b4ff0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ jobs:
run: |
ninja -C build test
- run: meson --reconfigure -D wfmo=false build/
- run: ninja -C build/ test

macOS:
runs-on: macos-latest

Expand Down Expand Up @@ -66,11 +69,8 @@ jobs:
CXX: CL.exe

steps:
- name: checkout code
uses: actions/checkout@v2

- name: install python
uses: actions/setup-python@v1
- uses: actions/checkout@v2
- uses: actions/setup-python@v1

- name: use msvc x64 toolchain
uses: ilammy/msvc-dev-cmd@v1
Expand Down
12 changes: 7 additions & 5 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,13 @@ custom_target('pevents.hpp',
)

# Sample program demonstrating capabilities
sample = executable('sample', ['examples/sample.cpp'],
include_directories: incdir,
cpp_args: args,
override_options: ['cpp_std=' + test_std],
dependencies: [pevents])
if get_option('wfmo')
sample = executable('sample', ['examples/sample.cpp'],
include_directories: incdir,
cpp_args: args,
override_options: ['cpp_std=' + test_std],
dependencies: [pevents])
endif

tests = []
test_args = []
Expand Down

0 comments on commit 42b4ff0

Please sign in to comment.