From 0dbeddb80926d8118aef142f20acc9788d690eac Mon Sep 17 00:00:00 2001
From: Jaeyun <jy1210.jung@samsung.com>
Date: Wed, 15 Jul 2020 16:31:15 +0900
Subject: [PATCH] [SAM/CodeClean] remove global val

sam report, remove global val in openvino plugin.
update script to install common header file.

Signed-off-by: Jaeyun <jy1210.jung@samsung.com>
---
 ext/nnstreamer/tensor_filter/tensor_filter_openvino.cc |  7 +++++++
 ext/nnstreamer/tensor_filter/tensor_filter_openvino.hh |  7 -------
 gst/nnstreamer/include/meson.build                     | 10 ++++------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_openvino.cc b/ext/nnstreamer/tensor_filter/tensor_filter_openvino.cc
index fd1a786..f7dfc6f 100644
--- a/ext/nnstreamer/tensor_filter/tensor_filter_openvino.cc
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_openvino.cc
@@ -40,6 +40,13 @@
 void init_filter_openvino (void) __attribute__ ((constructor));
 void fini_filter_openvino (void) __attribute__ ((destructor));
 
+static const gchar *openvino_accl_support[] = {
+  ACCL_NPU_MOVIDIUS_STR,    /** ACCL for default and auto config */
+  ACCL_NPU_STR,
+  ACCL_CPU_STR,
+  NULL
+};
+
 std::map<accl_hw, std::string> TensorFilterOpenvino::_nnsAcclHwToOVDevMap = {
     {ACCL_CPU, "CPU"},
     {ACCL_NPU, "MYRIAD"},
diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_openvino.hh b/ext/nnstreamer/tensor_filter/tensor_filter_openvino.hh
index 2025aed..17efb61 100644
--- a/ext/nnstreamer/tensor_filter/tensor_filter_openvino.hh
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_openvino.hh
@@ -44,13 +44,6 @@
 #include <string>
 #include <vector>
 
-const gchar *openvino_accl_support[] = {
-  ACCL_NPU_MOVIDIUS_STR,    /** ACCL for default and auto config */
-  ACCL_NPU_STR,
-  ACCL_CPU_STR,
-  NULL
-};
-
 class TensorFilterOpenvino
 {
 public:
diff --git a/gst/nnstreamer/include/meson.build b/gst/nnstreamer/include/meson.build
index 6882b52..1d126da 100644
--- a/gst/nnstreamer/include/meson.build
+++ b/gst/nnstreamer/include/meson.build
@@ -13,6 +13,10 @@ foreach h : nnst_common_headers
   nnstreamer_headers += join_paths(meson.current_source_dir(), h)
 endforeach
 
+if get_option('enable-filter-cpp-class')
+  nnstreamer_headers += join_paths(meson.current_source_dir(), 'nnstreamer_cppplugin_api_filter.hh')
+endif
+
 version_conf = configuration_data()
 version_conf.set('__NNSTREAMER_VERSION_MAJOR__', version_split[0])
 version_conf.set('__NNSTREAMER_VERSION_MINOR__', version_split[1])
@@ -28,9 +32,3 @@ nnstreamer_headers += generated_h
 install_headers(nnstreamer_headers,
   subdir: 'nnstreamer'
 )
-
-if get_option('enable-filter-cpp-class')
-  install_headers(['nnstreamer_cppplugin_api_filter.hh'],
-    subdir: 'nnstreamer'
-  )
-endif
-- 
2.7.4