[Build/Edge] check nns-edge dependency

Code clean, use pkgconfig to check nnstreamer-edge dependency.

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

diff --git a/gst/edge/meson.build b/gst/edge/meson.build
index 38cee04..722cef3 100644 (file)
--- a/gst/edge/meson.build
+++ b/gst/edge/meson.build
@@ -1,16 +1,16 @@
 edge_srcs = [
-    'edge_common.c',
-    'edge_elements.c',
-    'edge_sink.c',
-    'edge_src.c',
+  'edge_common.c',
+  'edge_elements.c',
+  'edge_sink.c',
+  'edge_src.c',
 ]
 
 edge_deps = [
-    glib_dep,
-    gst_base_dep,
-    gst_dep,
-    nnstreamer_dep,
-    nnstreamer_edge_dep,
+  glib_dep,
+  gst_base_dep,
+  gst_dep,
+  nnstreamer_dep,
+  nnstreamer_edge_support_deps
 ]
 
 if build_platform == 'tizen'
@@ -27,7 +27,7 @@ gstedge_shared = shared_library('gstedge',
 )
 
 gstedge_dep = declare_dependency(
-    link_with: gstedge_shared,
-    dependencies: edge_deps,
-    include_directories: include_directories('.')
+  link_with: gstedge_shared,
+  dependencies: edge_deps,
+  include_directories: include_directories('.')
 )

diff --git a/meson.build b/meson.build
index 7d4a9c1..dbe9e36 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -352,15 +352,6 @@ if not get_option('ncnn-support').disabled()
   endif
 endif
 
-# nnstreamer-edge
-nnstreamer_edge_dep = dependency('nnstreamer-edge', method : 'pkg-config', required: false)
-if get_option('nnstreamer-edge-support').enabled()
-  if not nnstreamer_edge_dep.found()
-    error('nnstreamer-edge not found whilt it is enabled.')
-  endif
-endif
-## Without the explicit method designation, it fails to find cflags in older Meson
-
 # datarepo requires json-glib-1.0 in the name of json_glib_dep
 json_glib_dep = dependency('json-glib-1.0', required: false)
 if get_option('datarepo-support').enabled() and not json_glib_dep.found()
@@ -476,7 +467,7 @@ features = {
     'project_args': { 'ENABLE_TRIX_ENGINE' : 1 }
   },
   'nnstreamer-edge-support': {
-    'extra_deps': [ nnstreamer_edge_dep ],
+    'target': 'nnstreamer-edge',
     'project_args': { 'ENABLE_NNSTREAMER_EDGE': 1 }
   },
   'mxnet-support': {