diff options
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/opencv/meson.build | 5 | ||||
| -rw-r--r-- | gst-libs/gst/wayland/meson.build | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build index ba132aa09..b11e2ba34 100644 --- a/gst-libs/gst/opencv/meson.build +++ b/gst-libs/gst/opencv/meson.build @@ -8,9 +8,8 @@ opencv_headers = [ 'gstopencvutils.h', 'gstopencvvideofilter.h', ] -install_headers(opencv_headers, subdir : 'gstreamer-1.0/gst/opencv') -opencv_dep = dependency('opencv', version : '>= 2.3.0', required : false) +opencv_dep = dependency('opencv', version : '>= 2.3.0', required : get_option('opencv')) if opencv_dep.found() gstopencv = library('gstopencv-' + api_version, opencv_sources, @@ -25,4 +24,6 @@ if opencv_dep.found() gstopencv_dep = declare_dependency(link_with: gstopencv, include_directories : [libsinc], dependencies : [gstvideo_dep, opencv_dep]) + + install_headers(opencv_headers, subdir : 'gstreamer-1.0/gst/opencv') endif diff --git a/gst-libs/gst/wayland/meson.build b/gst-libs/gst/wayland/meson.build index 7bff57103..d174a9fef 100644 --- a/gst-libs/gst/wayland/meson.build +++ b/gst-libs/gst/wayland/meson.build @@ -1,9 +1,9 @@ wl_req = '>= 1.4' -wl_client_dep = dependency('wayland-client', version: wl_req, required: false) -libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required: false) -wl_protocol_dep = dependency('wayland-protocols', version: wl_req, - required: false) -wl_scanner = find_program('wayland-scanner', required: false) +wl_client_dep = dependency('wayland-client', version: wl_req, required: get_option('wayland')) +libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required: get_option('wayland')) +wl_protocol_dep = dependency('wayland-protocols', version: wl_req, required: get_option('wayland')) +wl_scanner = find_program('wayland-scanner', required: get_option('wayland')) +# Also used in ext/wayland use_wayland = wl_protocol_dep.found() and wl_client_dep.found() and wl_scanner.found() and libdrm_dep.found() if use_wayland |