From 976e01d59beecb7c1eb79396e8ec1f8d066fa355 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 20 Mar 2021 23:28:43 +0200 Subject: meson: Use subdir_done() to reduce indentation Reduce the indentation in the gstreamer and qcam meson.build with subdir_done(). This follows similar patterns in cam and v4l2. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/gstreamer/meson.build | 50 ++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'src/gstreamer') diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build index 9e93ffac..ea246dcd 100644 --- a/src/gstreamer/meson.build +++ b/src/gstreamer/meson.build @@ -1,5 +1,17 @@ # SPDX-License-Identifier: CC0-1.0 +glib_dep = dependency('glib-2.0', required : get_option('gstreamer')) + +gst_dep_version = '>=1.14.0' +gstvideo_dep = dependency('gstreamer-video-1.0', version : gst_dep_version, + required : get_option('gstreamer')) +gstallocator_dep = dependency('gstreamer-allocators-1.0', version : gst_dep_version, + required : get_option('gstreamer')) + +if not glib_dep.found() or not gstvideo_dep.found() or not gstallocator_dep.found() + subdir_done() +endif + libcamera_gst_sources = [ 'gstlibcamera-utils.cpp', 'gstlibcamera.cpp', @@ -15,28 +27,18 @@ libcamera_gst_cpp_args = [ '-DPACKAGE="@0@"'.format(meson.project_name()), ] -glib_dep = dependency('glib-2.0', required : get_option('gstreamer')) - -gst_dep_version = '>=1.14.0' -gstvideo_dep = dependency('gstreamer-video-1.0', version : gst_dep_version, - required : get_option('gstreamer')) -gstallocator_dep = dependency('gstreamer-allocators-1.0', version : gst_dep_version, - required : get_option('gstreamer')) - -if glib_dep.found() and gstvideo_dep.found() and gstallocator_dep.found() - # The G_DECLARE_FINAL_TYPE macro creates static inline functions that were - # not marked as possibly unused prior to GLib v2.63.0. This causes clang to - # complain about the ones we are not using. Silence the -Wunused-function - # warning in that case. - if cc.get_id() == 'clang' and glib_dep.version().version_compare('<2.63.0') - libcamera_gst_cpp_args += ['-Wno-unused-function'] - endif - - libcamera_gst = shared_library('gstlibcamera', - libcamera_gst_sources, - cpp_args : libcamera_gst_cpp_args, - dependencies : [libcamera_dep, gstvideo_dep, gstallocator_dep], - install: true, - install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')), - ) +# The G_DECLARE_FINAL_TYPE macro creates static inline functions that were +# not marked as possibly unused prior to GLib v2.63.0. This causes clang to +# complain about the ones we are not using. Silence the -Wunused-function +# warning in that case. +if cc.get_id() == 'clang' and glib_dep.version().version_compare('<2.63.0') + libcamera_gst_cpp_args += ['-Wno-unused-function'] endif + +libcamera_gst = shared_library('gstlibcamera', + libcamera_gst_sources, + cpp_args : libcamera_gst_cpp_args, + dependencies : [libcamera_dep, gstvideo_dep, gstallocator_dep], + install: true, + install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')), +) -- cgit v1.2.1