Register the new per-module type-infos output files so they are generated during the QAPI code generation step and compiled into the build.
Signed-off-by: Marc-André Lureau <[email protected]> --- qapi/meson.build | 4 ++++ tests/include/meson.build | 2 ++ tests/meson.build | 6 ++++++ tests/qapi-schema/meson.build | 1 + 4 files changed, 13 insertions(+) diff --git a/qapi/meson.build b/qapi/meson.build index a46269b5a0c..7ae3843de6e 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -80,6 +80,7 @@ endif qapi_nonmodule_outputs = [ 'qapi-introspect.c', 'qapi-introspect.h', 'qapi-types.c', 'qapi-types.h', + 'qapi-type-infos.c', 'qapi-type-infos.h', 'qapi-visit.h', 'qapi-visit.c', 'qapi-commands.h', 'qapi-commands.c', 'qapi-init-commands.h', 'qapi-init-commands.c', @@ -90,6 +91,7 @@ qapi_nonmodule_outputs = [ qapi_outputs = qapi_nonmodule_outputs + [ 'qapi-builtin-types.c', 'qapi-builtin-visit.c', 'qapi-builtin-types.h', 'qapi-builtin-visit.h', + 'qapi-builtin-type-infos.c', 'qapi-builtin-type-infos.h', ] qapi_inputs = [] @@ -100,6 +102,8 @@ foreach module : qapi_all_modules 'qapi-types-@[email protected]'.format(module), 'qapi-visit-@[email protected]'.format(module), 'qapi-visit-@[email protected]'.format(module), + 'qapi-type-infos-@[email protected]'.format(module), + 'qapi-type-infos-@[email protected]'.format(module), ] if have_system or have_tools qapi_module_outputs += [ diff --git a/tests/include/meson.build b/tests/include/meson.build index 8e8d1ec4e69..026480d9685 100644 --- a/tests/include/meson.build +++ b/tests/include/meson.build @@ -4,6 +4,8 @@ test_qapi_outputs_extra = [ 'test-qapi-commands-sub-module.h', 'test-qapi-events-sub-module.c', 'test-qapi-events-sub-module.h', + 'test-qapi-type-infos-sub-module.c', + 'test-qapi-type-infos-sub-module.h', 'test-qapi-types-sub-module.c', 'test-qapi-types-sub-module.h', 'test-qapi-visit-sub-module.c', diff --git a/tests/meson.build b/tests/meson.build index 9ba04bbedd3..71dc4ac8bf9 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -2,6 +2,8 @@ subdir('bench') subdir('qemu-iotests') test_qapi_outputs = [ + 'qapi-builtin-type-infos.c', + 'qapi-builtin-type-infos.h', 'qapi-builtin-types.c', 'qapi-builtin-types.h', 'qapi-builtin-visit.c', @@ -22,6 +24,10 @@ test_qapi_outputs = [ 'test-qapi-init-commands.h', 'test-qapi-introspect.c', 'test-qapi-introspect.h', + 'test-qapi-type-infos-sub-sub-module.c', + 'test-qapi-type-infos-sub-sub-module.h', + 'test-qapi-type-infos.c', + 'test-qapi-type-infos.h', 'test-qapi-types-sub-sub-module.c', 'test-qapi-types-sub-sub-module.h', 'test-qapi-types.c', diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index debff633ac1..b10f081554d 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -232,6 +232,7 @@ custom_target('QAPI doc', 'doc-good-qapi-init-commands.c', 'doc-good-qapi-init-commands.h', 'doc-good-qapi-introspect.c', 'doc-good-qapi-introspect.h', 'doc-good-qapi-types.c', 'doc-good-qapi-types.h', + 'doc-good-qapi-type-infos.c', 'doc-good-qapi-type-infos.h', 'doc-good-qapi-visit.c', 'doc-good-qapi-visit.h' ], input: files('doc-good.json'), command: [ qapi_gen, '-o', meson.current_build_dir(), -- 2.54.0
