Merge pull request #899 from openzim/fix_manylinux_compile_release

openzim · Jun 24, 2024 · 10532fc · 10532fc
2 parents 243a2c6 + 70afbbc
commit 10532fc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/test/meson.build b/test/meson.build
@@ -31,9 +31,9 @@ endif
 
 datadir = get_option('test_data_dir')
 if datadir == 'none'
-    test_cpp_args = '-DWITH_TEST_DATA=0'
+    test_cpp_args = ['-DWITH_TEST_DATA=0']
 else
-    test_cpp_args = '-DWITH_TEST_DATA=1'
+    test_cpp_args = ['-DWITH_TEST_DATA=1']
     if datadir == ''
         # We need to download the test data.
         datadir = join_paths(meson.current_build_dir(), 'data')
@@ -44,6 +44,10 @@ endif
 testenv = environment()
 testenv.set('ZIM_TEST_DATA_DIR', datadir)
 
+if cpp.get_id() == 'gcc' and cpp.version().version_compare('>=12.0.0') and cpp.version().version_compare('<13.0.0')
+    test_cpp_args += ['-Wno-error=restrict']
+endif
+
 if gtest_dep.found() and not meson.is_cross_build()
     foreach test_name : tests
         test_exe = executable(test_name, [test_name+'.cpp', 'tools.cpp'],