meson: Fix space around colon issues

The meson style, which libcamera follows, recommends a space before
colons in function parameters. Fix the style violations through the
project.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2023-07-06 10:23:36 +03:00
parent adb1bbb748
commit ca437b4a0c
12 changed files with 26 additions and 26 deletions

View file

@ -92,8 +92,8 @@ if sphinx.found()
install_dir : doc_install_dir) install_dir : doc_install_dir)
custom_target('documentation-linkcheck', custom_target('documentation-linkcheck',
command: [sphinx, '-W', '-b', 'linkcheck', meson.current_source_dir(), '@OUTPUT@'], command : [sphinx, '-W', '-b', 'linkcheck', meson.current_source_dir(), '@OUTPUT@'],
build_always_stale: true, build_always_stale : true,
input: docs_sources, input : docs_sources,
output: 'linkcheck') output : 'linkcheck')
endif endif

View file

@ -37,4 +37,4 @@ libcamera_base_headers = [
] ]
install_headers(libcamera_base_public_headers, install_headers(libcamera_base_public_headers,
subdir: libcamera_base_include_dir) subdir : libcamera_base_include_dir)

View file

@ -4,9 +4,9 @@ subdir('tracepoints')
libcamera_tracepoint_header = custom_target( libcamera_tracepoint_header = custom_target(
'tp_header', 'tp_header',
input: ['tracepoints.h.in', tracepoint_files], input : ['tracepoints.h.in', tracepoint_files],
output: 'tracepoints.h', output : 'tracepoints.h',
command: [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'], command : [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'],
) )
libcamera_internal_headers = files([ libcamera_internal_headers = files([

View file

@ -9,7 +9,7 @@ libcamera_ipa_headers = files([
]) ])
install_headers(libcamera_ipa_headers, install_headers(libcamera_ipa_headers,
subdir: libcamera_ipa_include_dir) subdir : libcamera_ipa_include_dir)
libcamera_generated_ipa_headers = [] libcamera_generated_ipa_headers = []

View file

@ -20,7 +20,7 @@ project('libcamera', 'c', 'cpp',
libcamera_git_version = run_command('utils/gen-version.sh', libcamera_git_version = run_command('utils/gen-version.sh',
meson.project_build_root(), meson.project_build_root(),
meson.project_source_root(), meson.project_source_root(),
check: false).stdout().strip() check : false).stdout().strip()
# If the source tree isn't under git control, set libcamera_git_version to the # If the source tree isn't under git control, set libcamera_git_version to the
# meson project version. # meson project version.
@ -49,7 +49,7 @@ if libcamera_version != project_version
meson.project_build_root(), meson.project_build_root(),
meson.project_source_root(), meson.project_source_root(),
project_version, project_version,
check: false).stdout().strip() check : false).stdout().strip()
libcamera_version = project_version libcamera_version = project_version
# Append a marker to show we have modified this version string. # Append a marker to show we have modified this version string.
@ -109,7 +109,7 @@ if cc.get_id() == 'clang'
# Use libc++ by default if available instead of libstdc++ when compiling # Use libc++ by default if available instead of libstdc++ when compiling
# with clang. # with clang.
if cc.find_library('libc++', required: false).found() if cc.find_library('libc++', required : false).found()
cpp_arguments += [ cpp_arguments += [
'-stdlib=libc++', '-stdlib=libc++',
] ]
@ -236,7 +236,7 @@ subdir('test')
if not meson.is_cross_build() if not meson.is_cross_build()
kernel_version_req = '>= 5.0.0' kernel_version_req = '>= 5.0.0'
kernel_version = run_command('uname', '-r', check: true).stdout().strip() kernel_version = run_command('uname', '-r', check : true).stdout().strip()
if not kernel_version.version_compare(kernel_version_req) if not kernel_version.version_compare(kernel_version_req)
warning('The current running kernel version @0@ is too old to run libcamera.' warning('The current running kernel version @0@ is too old to run libcamera.'
.format(kernel_version)) .format(kernel_version))
@ -249,13 +249,13 @@ endif
# running libcamera from the build directory to locate resources in the source # running libcamera from the build directory to locate resources in the source
# directory (such as IPA configuration files). # directory (such as IPA configuration files).
run_command('ln', '-fsT', meson.project_source_root(), meson.project_build_root() / 'source', run_command('ln', '-fsT', meson.project_source_root(), meson.project_build_root() / 'source',
check: true) check : true)
configure_file(output : 'config.h', configuration : config_h) configure_file(output : 'config.h', configuration : config_h)
# Check for python installation and modules. # Check for python installation and modules.
py_mod = import('python') py_mod = import('python')
py_mod.find_installation('python3', modules: py_modules) py_mod.find_installation('python3', modules : py_modules)
## Summarise Configurations ## Summarise Configurations
summary({ summary({

View file

@ -59,12 +59,12 @@ option('qcam',
option('test', option('test',
type : 'boolean', type : 'boolean',
value : false, value : false,
description: 'Compile and include the tests') description : 'Compile and include the tests')
option('tracing', option('tracing',
type : 'feature', type : 'feature',
value : 'auto', value : 'auto',
description: 'Enable tracing (based on lttng)') description : 'Enable tracing (based on lttng)')
option('v4l2', option('v4l2',
type : 'boolean', type : 'boolean',

View file

@ -57,9 +57,9 @@ if ((cc.get_id() == 'gcc' and cc.version().version_compare('>=9.0') and
qt5_cpp_args += ['-Wno-deprecated-copy'] qt5_cpp_args += ['-Wno-deprecated-copy']
endif endif
resources = qt5.preprocess(moc_headers: qcam_moc_headers, resources = qt5.preprocess(moc_headers : qcam_moc_headers,
qresources : qcam_resources, qresources : qcam_resources,
dependencies: qt5_dep) dependencies : qt5_dep)
qcam = executable('qcam', qcam_sources, resources, qcam = executable('qcam', qcam_sources, resources,
install : true, install : true,

View file

@ -43,6 +43,6 @@ libcamera_gst = shared_library('gstlibcamera',
libcamera_gst_sources, libcamera_gst_sources,
cpp_args : libcamera_gst_cpp_args, cpp_args : libcamera_gst_cpp_args,
dependencies : [libcamera_public, gstvideo_dep, gstallocator_dep], dependencies : [libcamera_public, gstvideo_dep, gstallocator_dep],
install: true, install : true,
install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')), install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
) )

View file

@ -93,9 +93,9 @@ endif
if not libcrypto.found() if not libcrypto.found()
warning('Neither gnutls nor libcrypto found, all IPA modules will be isolated') warning('Neither gnutls nor libcrypto found, all IPA modules will be isolated')
summary({'IPA modules signed with': 'None (modules will run isolated)'}, summary({'IPA modules signed with': 'None (modules will run isolated)'},
section: 'Configuration') section : 'Configuration')
else else
summary({'IPA modules signed with': libcrypto.name()}, section: 'Configuration') summary({'IPA modules signed with' : libcrypto.name()}, section : 'Configuration')
endif endif
if liblttng.found() if liblttng.found()

View file

@ -93,11 +93,11 @@ pycamera = shared_module('_libcamera',
run_command('ln', '-fsrT', files('__init__.py'), run_command('ln', '-fsrT', files('__init__.py'),
meson.current_build_dir() / '__init__.py', meson.current_build_dir() / '__init__.py',
check: true) check : true)
run_command('ln', '-fsrT', meson.current_source_dir() / 'utils', run_command('ln', '-fsrT', meson.current_source_dir() / 'utils',
meson.current_build_dir() / 'utils', meson.current_build_dir() / 'utils',
check: true) check : true)
install_data(['__init__.py'], install_dir : destdir) install_data(['__init__.py'], install_dir : destdir)

View file

@ -9,7 +9,7 @@ gstreamer_tests = [
{'name': 'multi_stream_test', 'sources': ['gstreamer_multi_stream_test.cpp']}, {'name': 'multi_stream_test', 'sources': ['gstreamer_multi_stream_test.cpp']},
{'name': 'device_provider_test', 'sources': ['gstreamer_device_provider_test.cpp']}, {'name': 'device_provider_test', 'sources': ['gstreamer_device_provider_test.cpp']},
] ]
gstreamer_dep = dependency('gstreamer-1.0', required: true) gstreamer_dep = dependency('gstreamer-1.0', required : true)
foreach test : gstreamer_tests foreach test : gstreamer_tests
exe = executable(test['name'], test['sources'], 'gstreamer_test.cpp', exe = executable(test['name'], test['sources'], 'gstreamer_test.cpp',

View file

@ -10,5 +10,5 @@ foreach test : stream_tests
dependencies : libcamera_public, dependencies : libcamera_public,
link_with : test_libraries, link_with : test_libraries,
include_directories : test_includes_internal) include_directories : test_includes_internal)
test(test['name'], exe, suite: 'stream') test(test['name'], exe, suite : 'stream')
endforeach endforeach