meson: gl/gtk tests: Add video_dep to the helper

The gtk helper library includes videooverlay.h hence must have a
dependency on video_dep, this allow removing the dep from the dependant
executables.
This commit is contained in:
Nicolas Dufresne 2018-07-21 09:13:27 -04:00
parent 5ed774350a
commit bea4d13a99
5 changed files with 7 additions and 7 deletions

View file

@ -1,5 +1,5 @@
executable('3dvideo', ['main.cpp', 'mviewwidget.c'], executable('3dvideo', ['main.cpp', 'mviewwidget.c'],
cpp_args : [gst_plugins_base_args], cpp_args : [gst_plugins_base_args],
include_directories: [configinc, libsinc], include_directories: [configinc, libsinc],
dependencies : [gstgtkhelper_dep, gstgl_dep, video_dep, x11_dep], dependencies : [gstgtkhelper_dep, gstgl_dep, x11_dep],
install: false) install: false)

View file

@ -1,6 +1,6 @@
executable('filtervideooverlay', 'main.cpp', executable('filtervideooverlay', 'main.cpp',
cpp_args : [gst_plugins_base_args], cpp_args : [gst_plugins_base_args],
include_directories: [configinc, libsinc], include_directories: [configinc, libsinc],
dependencies : [gstgtkhelper_dep, video_dep, x11_dep], dependencies : [gstgtkhelper_dep, x11_dep],
install: false) install: false)

View file

@ -1,11 +1,11 @@
executable('fxtest', 'fxtest.c', executable('fxtest', 'fxtest.c',
c_args : [gst_plugins_base_args], c_args : [gst_plugins_base_args],
include_directories: [configinc, libsinc], include_directories: [configinc, libsinc],
dependencies : [gstgtkhelper_dep, video_dep, x11_dep], dependencies : [gstgtkhelper_dep, x11_dep],
install: false) install: false)
executable('pixbufdrop', 'pixbufdrop.c', executable('pixbufdrop', 'pixbufdrop.c',
c_args : [gst_plugins_base_args], c_args : [gst_plugins_base_args],
include_directories: [configinc, libsinc], include_directories: [configinc, libsinc],
dependencies : [gstgtkhelper_dep, video_dep, x11_dep], dependencies : [gstgtkhelper_dep, x11_dep],
install: false) install: false)

View file

@ -7,13 +7,13 @@ gstgtkhelper = static_library ('gstgtkhelper',
['gstgtk.c'], ['gstgtk.c'],
c_args : gst_plugins_base_args, c_args : gst_plugins_base_args,
include_directories : [configinc, libsinc], include_directories : [configinc, libsinc],
dependencies : [gst_base_dep, gtk_dep], dependencies : [gst_base_dep, video_dep, gtk_dep],
install : false) install : false)
gstgtkhelper_dep = declare_dependency(link_with: gstgtkhelper, gstgtkhelper_dep = declare_dependency(link_with: gstgtkhelper,
compile_args : extra_args, compile_args : extra_args,
include_directories : include_directories('.'), include_directories : include_directories('.'),
dependencies : [gst_base_dep, gtk_dep]) dependencies : [gst_base_dep, video_dep, gtk_dep])
subdir('filternovideooverlay') subdir('filternovideooverlay')
subdir('filtervideooverlay') subdir('filtervideooverlay')

View file

@ -1,5 +1,5 @@
executable('switchvideooverlay', 'main.cpp', executable('switchvideooverlay', 'main.cpp',
cpp_args : [gst_plugins_base_args], cpp_args : [gst_plugins_base_args],
include_directories: [configinc, libsinc], include_directories: [configinc, libsinc],
dependencies : [gstgtkhelper_dep, gstgl_dep, video_dep, x11_dep], dependencies : [gstgtkhelper_dep, gstgl_dep, x11_dep],
install: false) install: false)