diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2024-08-08 16:58:24 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2024-08-15 04:44:20 +0300 |
| commit | cbffcbe362b2f973a0249eee38aeea24cd17fb0d (patch) | |
| tree | 29263f9965619886430b74f77051ab526a16481f | |
| parent | b8d318ebeba0710d5a7f8292a02570bb9a886f8b (diff) | |
meson: Fix mismatch in controls and properties generated file names
The header for controls and properties are generated from the
control_ids.h.in and property_ids.h.in templates respectively, and the
generated files are named control_ids.h and property_ids.h.
For sources, the templates are named control_ids.cpp.in and
property_ids.cpp.in, but the output files are named controls_ids.cpp and
properties_ids.cpp. This discrepancy causes confusion. Fix it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
| -rw-r--r-- | src/libcamera/meson.build | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 79b8cbaf..e5e959d9 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -129,21 +129,25 @@ endif control_sources = [] controls_mode_files = { - 'controls' : controls_files, - 'properties' : properties_files, + 'controls': [ + controls_files, + 'control_ids.cpp', + ], + 'properties': [ + properties_files, + 'property_ids.cpp', + ], } -foreach mode, input_files : controls_mode_files - if mode == 'controls' - template_file = files('control_ids.cpp.in') - else - template_file = files('property_ids.cpp.in') - endif +foreach mode, inout_files : controls_mode_files + input_files = inout_files[0] + output_file = inout_files[1] + template_file = files(output_file + '.in') ranges_file = files('control_ranges.yaml') control_sources += custom_target(mode + '_cpp', input : input_files, - output : mode + '_ids.cpp', + output : output_file, command : [gen_controls, '-o', '@OUTPUT@', '--mode', mode, '-t', template_file, '-r', ranges_file, '@INPUT@']) |