tensor_query: nnstreamer-edge dependency fix

1. nnstreamer-edge.h is from another package. Use #include appropriately.
2. dependency on nnstreamer-edge is not expressed proprely in meson.

Potential issue: Android build w/ nnstreamer-edge might need further care in /jni

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/gst/edge/meson.build b/gst/edge/meson.build
index e907ba8..c3d6f59 100644 (file)
--- a/gst/edge/meson.build
+++ b/gst/edge/meson.build
@@ -9,7 +9,7 @@ edge_dep = [
     glib_dep,
     gst_base_dep,
     gst_dep,
-    nnstreamer_edge_support_deps
+    nnstreamer_edge_dep,
 ]
 
 if build_platform == 'tizen'

diff --git a/gst/nnstreamer/tensor_query/tensor_query_client.h b/gst/nnstreamer/tensor_query/tensor_query_client.h
index 0840589..3aa57d7 100644 (file)
--- a/gst/nnstreamer/tensor_query/tensor_query_client.h
+++ b/gst/nnstreamer/tensor_query/tensor_query_client.h
@@ -16,7 +16,7 @@
 #include <gst/gst.h>
 #include <gio/gio.h>
 #include <tensor_common.h>
-#include "nnstreamer-edge.h"
+#include <nnstreamer-edge.h>
 
 G_BEGIN_DECLS
 

diff --git a/gst/nnstreamer/tensor_query/tensor_query_common.h b/gst/nnstreamer/tensor_query/tensor_query_common.h
index 4351c43..1b7fb23 100644 (file)
--- a/gst/nnstreamer/tensor_query/tensor_query_common.h
+++ b/gst/nnstreamer/tensor_query/tensor_query_common.h
@@ -16,7 +16,7 @@
 #include "tensor_typedef.h"
 #include "tensor_common.h"
 #include "tensor_meta.h"
-#include "nnstreamer-edge.h"
+#include <nnstreamer-edge.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/gst/nnstreamer/tensor_query/tensor_query_server.h b/gst/nnstreamer/tensor_query/tensor_query_server.h
index 80ab732..cf1b385 100644 (file)
--- a/gst/nnstreamer/tensor_query/tensor_query_server.h
+++ b/gst/nnstreamer/tensor_query/tensor_query_server.h
@@ -15,7 +15,7 @@
 
 #include <gst/gst.h>
 #include <tensor_common.h>
-#include "nnstreamer-edge.h"
+#include <nnstreamer-edge.h>
 #include "tensor_meta.h"
 
 G_BEGIN_DECLS

diff --git a/meson.build b/meson.build
index 56cca54..4d6604f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -325,6 +325,15 @@ if not get_option('mxnet-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
+
 # features registration to be controlled
 #
 # register feature as follows
@@ -421,7 +430,7 @@ features = {
     'project_args': { 'ENABLE_TRIX_ENGINE' : 1 }
   },
   'nnstreamer-edge-support': {
-    'target': 'nnstreamer-edge',
+    'extra_deps': [ nnstreamer_edge_dep ],
     'project_args': { 'ENABLE_NNSTREAMER_EDGE': 1 }
   },
   'mxnet-support': {