From 91f6ee63362f199f79967299107edcc3bfa58aad Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Thu, 25 Jul 2024 13:38:27 +0200
Subject: [PATCH] Disable -Werror for dependencies in meson.build instead of CI
 workflow

---
 .github/workflows/build_and_test.yml |  5 -----
 meson.build                          | 10 +++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 1205f10..75ee195 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -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
diff --git a/meson.build b/meson.build
index 1224c7d..92231fb 100644
--- a/meson.build
+++ b/meson.build
@@ -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.