[Meson] remove unnecessary option

For opencv test, 'enable-opencv-test' is unnecessary option.
Check dependency of opencv pkg and build libraries when found the dependency.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/meson_options.txt b/meson_options.txt
index ba25735..2430dab 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,10 +1,9 @@
 option('enable-test', type: 'boolean', value: true)
 option('install-test', type: 'boolean', value: false)
-option('enable-opencv-test', type: 'boolean', value: true)
 option('enable-tensorflow-lite', type: 'boolean', value: true)
 option('enable-tensorflow', type: 'boolean', value: true)
-option('enable-movidius-ncsdk2', type: 'boolean', value: false)
 option('enable-tensorflow-mem-optmz', type: 'boolean', value: true)
+option('enable-movidius-ncsdk2', type: 'boolean', value: false)
 option('install-example', type: 'boolean', value: false)
 option('disable-video-support', type: 'boolean', value: false)
 option('disable-audio-support', type: 'boolean', value: false)

diff --git a/nnstreamer_example/custom_example_opencv/meson.build b/nnstreamer_example/custom_example_opencv/meson.build
index 0f2a177..9da8eab 100644 (file)
--- a/nnstreamer_example/custom_example_opencv/meson.build
+++ b/nnstreamer_example/custom_example_opencv/meson.build
@@ -1,15 +1,17 @@
-opencv_dep = dependency('opencv')
+opencv_dep = dependency('opencv', required: false)
 
-library('nnstreamer_customfilter_opencv_scaler',
-  'nnstreamer_customfilter_opencv_scaler.cc',
-  dependencies: [glib_dep, gst_dep, nnstreamer_dep, opencv_dep],
-  install: get_option('install-example'),
-  install_dir: customfilter_install_dir
-)
+if opencv_dep.found()
+  library('nnstreamer_customfilter_opencv_scaler',
+    'nnstreamer_customfilter_opencv_scaler.cc',
+    dependencies: [glib_dep, gst_dep, nnstreamer_dep, opencv_dep],
+    install: get_option('install-example'),
+    install_dir: customfilter_install_dir
+  )
 
-library('nnstreamer_customfilter_opencv_average',
-  'nnstreamer_customfilter_opencv_average.cc',
-  dependencies: [glib_dep, gst_dep, nnstreamer_dep, opencv_dep],
-  install: get_option('install-example'),
-  install_dir: customfilter_install_dir
-)
+  library('nnstreamer_customfilter_opencv_average',
+    'nnstreamer_customfilter_opencv_average.cc',
+    dependencies: [glib_dep, gst_dep, nnstreamer_dep, opencv_dep],
+    install: get_option('install-example'),
+    install_dir: customfilter_install_dir
+  )
+endif

diff --git a/nnstreamer_example/meson.build b/nnstreamer_example/meson.build
index aa64117..ca92703 100644 (file)
--- a/nnstreamer_example/meson.build
+++ b/nnstreamer_example/meson.build
@@ -1,8 +1,6 @@
 subdir('custom_example_passthrough')
 subdir('custom_example_scaler')
 subdir('custom_example_average')
-if get_option('enable-opencv-test')
-   subdir('custom_example_opencv')
-endif
+subdir('custom_example_opencv')
 subdir('custom_example_RNN')
 subdir('custom_example_LSTM')