diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2020-08-17 18:51:17 +0100 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-08-18 16:46:42 +0000 |
| commit | 57d61172c85d60be0a9d7d8e262f90fa461ec091 (patch) | |
| tree | 6f88c715f7661ffffd9f715373377de82cfd7900 /docs | |
| parent | dc58065dfb849f04a23ec40e0989fb794dcfb2f7 (diff) | |
| download | gstreamer-plugins-bad-57d61172c85d60be0a9d7d8e262f90fa461ec091.tar.gz | |
docs: fix gst-docs build if opencv is not being built
The disabler in opencv_dep (retrieved via libs_doc) will
cause a meson interpreter error if opencv is not being built:
ERROR: The += operator currently only works with arrays, dicts, strings or ints
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1519>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/meson.build b/docs/meson.build index 47d60ef3b..09ee1358f 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -113,7 +113,6 @@ if build_gir {'name': 'player', 'gir': player_gir, 'lib': gstplayer_dep}, {'name': 'insertbin', 'gir': insertbin_gir, 'lib': gstinsertbin_dep}, {'name': 'codecparsers', 'lib': gstcodecparsers_dep}, - {'name': 'opencv', 'lib': gstopencv_dep, 'c_source_patterns': ['*.h', '*.cpp'], 'extra_c_flags': ['-x c++']}, {'name': 'adaptivedemux', 'lib': gstadaptivedemux_dep}, {'name': 'basecamerabinsrc', 'gir': basecamerabin_gir, 'lib': gstbasecamerabin_dep}, {'name': 'webrtc', 'gir': webrtc_gir, 'lib': gstwebrtc_dep, 'suffix': 'lib'}, @@ -122,6 +121,12 @@ if build_gir {'name': 'codecs', 'gir': codecs_gir, 'lib': gstcodecs_dep}, ] + if gstopencv_dep.found() + libs += [ + {'name': 'opencv', 'lib': gstopencv_dep, 'c_source_patterns': ['*.h', '*.cpp'], 'extra_c_flags': ['-x c++']}, + ] + endif + if gstvulkan_dep.found() libs += [ {'name': 'vulkan', 'gir': vulkan_gir, 'lib': gstvulkan_dep, 'suffix': 'lib'}, |