diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2022-10-12 09:56:19 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2022-10-12 09:56:19 +0000 |
| commit | e90733a4576ed8e44546f8409027000dbcc6aaf7 (patch) | |
| tree | 1c1a6c2622507a3a046aee64454731a45eb9076f /gmodule | |
| parent | 90ae06a9f6a84b38793edd10339874b0b0a19c51 (diff) | |
| parent | 9b6cc47bcb2c02e68811cda632efd547532bca42 (diff) | |
| download | glib-e90733a4576ed8e44546f8409027000dbcc6aaf7.tar.gz | |
Merge branch 'atomic-older-cplusplus' into 'main'
gatomic: fix the atomic compare_and_exchange macros on older C++ standard versions
See merge request GNOME/glib!2864
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/tests/meson.build | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gmodule/tests/meson.build b/gmodule/tests/meson.build index d8ad5f758..db7232b49 100644 --- a/gmodule/tests/meson.build +++ b/gmodule/tests/meson.build @@ -15,8 +15,19 @@ if have_cxx gmodule_tests += { 'cxx' : { 'source' : ['cxx.cpp'], + 'suite' : ['cpp'], } } + + foreach std, arg: cxx_standards + gmodule_tests += { + 'cxx-@0@'.format(std) : { + 'source' : ['cxx.cpp'], + 'suite' : ['cpp'], + 'cpp_args' : [arg], + }, + } + endforeach endif module_suffix = [] @@ -51,6 +62,7 @@ test_env.set('MALLOC_CHECK_', '2') test_deps = [libm, thread_dep, libglib_dep, libgmodule_dep] test_cargs = ['-DG_LOG_DOMAIN="GModule"', '-UG_DISABLE_ASSERT'] +test_cpp_args = test_cargs foreach test_name, extra_args : gmodule_tests source = extra_args.get('source', test_name + '.c') @@ -72,6 +84,7 @@ foreach test_name, extra_args : gmodule_tests exe = executable(test_name, source, c_args : test_cargs + extra_args.get('c_args', []), + cpp_args : test_cpp_args + extra_args.get('cpp_args', []), link_args : extra_args.get('link_args', []), dependencies : test_deps + extra_args.get('dependencies', []), export_dynamic : extra_args.get('export_dynamic', false), |