mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-06 18:52:07 +00:00
qroverlay: fix auto detection of json-glib for plugin
Only want to check for json-glib when libqrencode was found, but also it shouldn't be required but depend on the option. Fixes #1465 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1824>
This commit is contained in:
parent
d1e7290109
commit
53947cad29
1 changed files with 12 additions and 10 deletions
|
@ -1,14 +1,16 @@
|
||||||
qrencode_dep = dependency('libqrencode', required: get_option('qroverlay'))
|
qrencode_dep = dependency('libqrencode', required: get_option('qroverlay'))
|
||||||
json_dep = dependency('json-glib-1.0', fallback : ['json-glib', 'json_glib_dep'])
|
|
||||||
if qrencode_dep.found()
|
if qrencode_dep.found()
|
||||||
gstqroverlay = library('gstqroverlay', ['gstqroverlay.c', 'gstdebugqroverlay.c', 'gstbaseqroverlay.c'],
|
json_dep = dependency('json-glib-1.0', fallback : ['json-glib', 'json_glib_dep'], required: get_option('qroverlay'))
|
||||||
c_args : gst_plugins_bad_args,
|
if json_dep.found()
|
||||||
include_directories : [configinc],
|
gstqroverlay = library('gstqroverlay', ['gstqroverlay.c', 'gstdebugqroverlay.c', 'gstbaseqroverlay.c'],
|
||||||
dependencies : [gstvideo_dep, qrencode_dep, json_dep],
|
c_args : gst_plugins_bad_args,
|
||||||
install : true,
|
include_directories : [configinc],
|
||||||
install_dir : plugins_install_dir,
|
dependencies : [gstvideo_dep, qrencode_dep, json_dep],
|
||||||
)
|
install : true,
|
||||||
pkgconfig.generate(gstqroverlay, install_dir : plugins_pkgconfig_install_dir)
|
install_dir : plugins_install_dir,
|
||||||
plugins += [gstqroverlay]
|
)
|
||||||
|
pkgconfig.generate(gstqroverlay, install_dir : plugins_pkgconfig_install_dir)
|
||||||
|
plugins += [gstqroverlay]
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue