[Meson] set dependency with include dir
authorJaeyun <jy1210.jung@samsung.com>
Thu, 20 Dec 2018 07:25:19 +0000 (16:25 +0900)
committerMyungJoo Ham <myungjoo.ham@gmail.com>
Fri, 21 Dec 2018 04:30:07 +0000 (13:30 +0900)
declare nnstreamer-lib dependency with include directory

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>
meson.build
tests/meson.build
tests/nnstreamer_tensors/tensors_test/meson.build

index c0faae8..436784f 100644 (file)
@@ -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,
index dae1597..c5ebfca 100644 (file)
@@ -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
index 252794e..dbae22b 100644 (file)
@@ -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]
 )