meson: Update minimum version to 0.57.0
Required for c++20 suppport.
Change-Id: If50d094a1ed68a5fbe5a5383e0840efea3eb64eb
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/test/meson.build b/test/meson.build
index 4e7f2b6..6be8abc 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,11 +1,11 @@
gtest = dependency('gtest', main: true, disabler: true, required: false)
gmock = dependency('gmock', disabler: true, required: false)
if not gtest.found() or not gmock.found()
+ gtest_opts = import('cmake').subproject_options()
+ gtest_opts.add_cmake_defines({'CMAKE_CXX_FLAGS': '-Wno-pedantic'})
gtest_proj = import('cmake').subproject(
'googletest',
- cmake_options: [
- '-DCMAKE_CXX_FLAGS=-Wno-pedantic',
- ],
+ options: gtest_opts,
required: false)
if gtest_proj.found()
gtest = declare_dependency(
@@ -74,12 +74,14 @@
endif
endif
if not catch2.found()
+ catch2_opts = import('cmake').subproject_options()
+ catch2_opts.add_cmake_defines({
+ 'BUILD_TESTING': 'OFF',
+ 'CMAKE_CXX_FLAGS': '-Wno-non-virtual-dtor',
+ })
catch2_proj = import('cmake').subproject(
'Catch2',
- cmake_options: [
- '-DBUILD_TESTING=OFF',
- '-DCMAKE_CXX_FLAGS=-Wno-non-virtual-dtor',
- ],
+ options: catch2_opts,
required: false)
if catch2_proj.found()
catch2 = declare_dependency(