Skip to content

Commit

Permalink
meson: Fix space around colon issues
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Umang Jain <[email protected]>
  • Loading branch information
pinchartl committed Jul 7, 2023
1 parent adb1bbb commit ca437b4
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 26 deletions.
8 changes: 4 additions & 4 deletions Documentation/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ if sphinx.found()
install_dir : doc_install_dir)

custom_target('documentation-linkcheck',
command: [sphinx, '-W', '-b', 'linkcheck', meson.current_source_dir(), '@OUTPUT@'],
build_always_stale: true,
input: docs_sources,
output: 'linkcheck')
command : [sphinx, '-W', '-b', 'linkcheck', meson.current_source_dir(), '@OUTPUT@'],
build_always_stale : true,
input : docs_sources,
output : 'linkcheck')
endif
2 changes: 1 addition & 1 deletion include/libcamera/base/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ libcamera_base_headers = [
]

install_headers(libcamera_base_public_headers,
subdir: libcamera_base_include_dir)
subdir : libcamera_base_include_dir)
6 changes: 3 additions & 3 deletions include/libcamera/internal/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ subdir('tracepoints')

libcamera_tracepoint_header = custom_target(
'tp_header',
input: ['tracepoints.h.in', tracepoint_files],
output: 'tracepoints.h',
command: [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'],
input : ['tracepoints.h.in', tracepoint_files],
output : 'tracepoints.h',
command : [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'],
)

libcamera_internal_headers = files([
Expand Down
2 changes: 1 addition & 1 deletion include/libcamera/ipa/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ libcamera_ipa_headers = files([
])

install_headers(libcamera_ipa_headers,
subdir: libcamera_ipa_include_dir)
subdir : libcamera_ipa_include_dir)

libcamera_generated_ipa_headers = []

Expand Down
12 changes: 6 additions & 6 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ project('libcamera', 'c', 'cpp',
libcamera_git_version = run_command('utils/gen-version.sh',
meson.project_build_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
# meson project version.
Expand Down Expand Up @@ -49,7 +49,7 @@ if libcamera_version != project_version
meson.project_build_root(),
meson.project_source_root(),
project_version,
check: false).stdout().strip()
check : false).stdout().strip()
libcamera_version = project_version

# Append a marker to show we have modified this version string.
Expand Down Expand Up @@ -109,7 +109,7 @@ if cc.get_id() == 'clang'

# Use libc++ by default if available instead of libstdc++ when compiling
# with clang.
if cc.find_library('libc++', required: false).found()
if cc.find_library('libc++', required : false).found()
cpp_arguments += [
'-stdlib=libc++',
]
Expand Down Expand Up @@ -236,7 +236,7 @@ subdir('test')

if not meson.is_cross_build()
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)
warning('The current running kernel version @0@ is too old to run libcamera.'
.format(kernel_version))
Expand All @@ -249,13 +249,13 @@ endif
# running libcamera from the build directory to locate resources in the source
# directory (such as IPA configuration files).
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)

# Check for python installation and modules.
py_mod = import('python')
py_mod.find_installation('python3', modules: py_modules)
py_mod.find_installation('python3', modules : py_modules)

## Summarise Configurations
summary({
Expand Down
4 changes: 2 additions & 2 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ option('qcam',
option('test',
type : 'boolean',
value : false,
description: 'Compile and include the tests')
description : 'Compile and include the tests')

option('tracing',
type : 'feature',
value : 'auto',
description: 'Enable tracing (based on lttng)')
description : 'Enable tracing (based on lttng)')

option('v4l2',
type : 'boolean',
Expand Down
4 changes: 2 additions & 2 deletions src/apps/qcam/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ if ((cc.get_id() == 'gcc' and cc.version().version_compare('>=9.0') and
qt5_cpp_args += ['-Wno-deprecated-copy']
endif

resources = qt5.preprocess(moc_headers: qcam_moc_headers,
resources = qt5.preprocess(moc_headers : qcam_moc_headers,
qresources : qcam_resources,
dependencies: qt5_dep)
dependencies : qt5_dep)

qcam = executable('qcam', qcam_sources, resources,
install : true,
Expand Down
2 changes: 1 addition & 1 deletion src/gstreamer/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ libcamera_gst = shared_library('gstlibcamera',
libcamera_gst_sources,
cpp_args : libcamera_gst_cpp_args,
dependencies : [libcamera_public, gstvideo_dep, gstallocator_dep],
install: true,
install : true,
install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
)
4 changes: 2 additions & 2 deletions src/libcamera/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ endif
if not libcrypto.found()
warning('Neither gnutls nor libcrypto found, all IPA modules will be isolated')
summary({'IPA modules signed with': 'None (modules will run isolated)'},
section: 'Configuration')
section : 'Configuration')
else
summary({'IPA modules signed with': libcrypto.name()}, section: 'Configuration')
summary({'IPA modules signed with' : libcrypto.name()}, section : 'Configuration')
endif

if liblttng.found()
Expand Down
4 changes: 2 additions & 2 deletions src/py/libcamera/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ pycamera = shared_module('_libcamera',

run_command('ln', '-fsrT', files('__init__.py'),
meson.current_build_dir() / '__init__.py',
check: true)
check : true)

run_command('ln', '-fsrT', meson.current_source_dir() / 'utils',
meson.current_build_dir() / 'utils',
check: true)
check : true)

install_data(['__init__.py'], install_dir : destdir)

Expand Down
2 changes: 1 addition & 1 deletion test/gstreamer/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ gstreamer_tests = [
{'name': 'multi_stream_test', 'sources': ['gstreamer_multi_stream_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
exe = executable(test['name'], test['sources'], 'gstreamer_test.cpp',
Expand Down
2 changes: 1 addition & 1 deletion test/stream/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ foreach test : stream_tests
dependencies : libcamera_public,
link_with : test_libraries,
include_directories : test_includes_internal)
test(test['name'], exe, suite: 'stream')
test(test['name'], exe, suite : 'stream')
endforeach

0 comments on commit ca437b4

Please sign in to comment.