Skip to content

Commit

Permalink
Disable -Werror for dependencies in meson.build instead of CI workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
msimberg committed Jul 25, 2024
1 parent c4922ac commit 91f6ee6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ jobs:
--buildtype ${{ matrix.buildtype }} \
--warnlevel 3 \
--werror \
-Dcatch2:werror=false \
-Dcli11:werror=false \
-Dfmt:werror=false \
-Dnlohmann_json:werror=false \
-Dsqlite3:werror=false \
build .
- name: Build
run: ninja -C build
Expand Down
10 changes: 5 additions & 5 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ conf_data = configuration_data()
#
# use meson wrap to provide the dependencies, because the 'default_library=static' option
# will be propogated to each dependency, for a statically linked executable.
catch_dep = subproject('catch2').get_variable('catch2_with_main_dep')
cli11_dep = subproject('cli11').get_variable('CLI11_dep')
fmt_dep = subproject('fmt').get_variable('fmt_dep')
json_dep = subproject('nlohmann_json').get_variable('nlohmann_json_dep')
sqlite3_dep = subproject('sqlite3').get_variable('sqlite3_dep')
catch_dep = subproject('catch2', default_options: 'werror=false').get_variable('catch2_with_main_dep')
cli11_dep = subproject('cli11', default_options: 'werror=false').get_variable('CLI11_dep')
fmt_dep = subproject('fmt', default_options: 'werror=false').get_variable('fmt_dep')
json_dep = subproject('nlohmann_json', default_options: 'werror=false').get_variable('nlohmann_json_dep')
sqlite3_dep = subproject('sqlite3', default_options: 'werror=false').get_variable('sqlite3_dep')

# the lib dependency is all of the common funtionality shared between the CLI
# and the slurm plugin.
Expand Down

0 comments on commit 91f6ee6

Please sign in to comment.