From: Jaeyun <jy1210.jung@samsung.com>
Date: Thu, 20 Dec 2018 07:25:19 +0000 (+0900)
Subject: [Meson] set dependency with include dir
X-Git-Tag: v0.1.0~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e487bba2e1ded88d344e0fb3d60d7a235b4a4feb;p=platform%2Fupstream%2Fnnstreamer.git

[Meson] set dependency with include dir

declare nnstreamer-lib dependency with include directory

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

diff --git a/meson.build b/meson.build
index c0faae8..436784f 100644
--- a/meson.build
+++ b/meson.build
@@ -170,7 +170,7 @@ if get_option('default_library') == 'static'
   nnstreamer_lib = nnstreamer_static
 endif
 
-nnstreamer_dep = declare_dependency(link_with: nnstreamer_lib)
+nnstreamer_dep = declare_dependency(link_with: nnstreamer_lib, include_directories: nnstreamer_inc)
 
 # Install headers into /{includedir}/nnstreamer
 install_headers(nnstreamer_headers,
diff --git a/tests/meson.build b/tests/meson.build
index dae1597..c5ebfca 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -29,8 +29,7 @@ if gtest_dep.found()
   unittest_common = executable('unittest_common',
     'common/unittest_common.cpp',
     cpp_args: nnstreamer_base_args,
-    dependencies: [nnstreamer_unittest_deps],
-    include_directories: nnstreamer_inc)
+    dependencies: [nnstreamer_unittest_deps])
 
   test('unittest_common', unittest_common)
 
@@ -38,8 +37,7 @@ if gtest_dep.found()
   unittest_sink = executable('unittest_sink',
     'nnstreamer_sink/unittest_sink.cpp',
     cpp_args: nnstreamer_base_args,
-    dependencies: [nnstreamer_unittest_deps],
-    include_directories: nnstreamer_inc)
+    dependencies: [nnstreamer_unittest_deps])
 
   test('unittest_sink', unittest_sink, args: ['--gst-plugin-path=../'])
 
@@ -47,8 +45,7 @@ if gtest_dep.found()
   unittest_plugins = executable('unittest_plugins',
     'nnstreamer_plugins/unittest_plugins.cpp',
     cpp_args: nnstreamer_base_args,
-    dependencies: [nnstreamer_unittest_deps],
-    include_directories: nnstreamer_inc)
+    dependencies: [nnstreamer_unittest_deps])
 
   test('unittest_plugins', unittest_plugins, args: ['--gst-plugin-path=../'])
 endif
diff --git a/tests/nnstreamer_tensors/tensors_test/meson.build b/tests/nnstreamer_tensors/tensors_test/meson.build
index 252794e..dbae22b 100644
--- a/tests/nnstreamer_tensors/tensors_test/meson.build
+++ b/tests/nnstreamer_tensors/tensors_test/meson.build
@@ -4,8 +4,7 @@ testtensors_sources = [
 
 testtensors_lib = library('testtensors',
   testtensors_sources,
-  dependencies: [gst_dep, nnstreamer_dep],
-  include_directories: nnstreamer_inc
+  dependencies: [gst_dep, nnstreamer_dep]
 )
 
 tensorscheck_sources = [
@@ -14,6 +13,5 @@ tensorscheck_sources = [
 
 tensorscheck_lib = library('tensorscheck',
   tensorscheck_sources,
-  dependencies: [gst_dep, nnstreamer_dep],
-  include_directories: nnstreamer_inc
+  dependencies: [gst_dep, nnstreamer_dep]
 )