[Build/Fix] Remove unnecessary glib dependency

This patch removes unnecessary glib dependency.

VD NPUMGR requires glib-2.0 dependency but it's provided
by npu-engine-example and available only in the Tizen env.

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/debian/control b/debian/control
index 379863e..e774e50 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: MyungJoo Ham <myungjoo.ham@samsung.com>
 Build-Depends: ninja-build, meson (>=0.50), debhelper (>=9),
  gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5, libgtest-dev, python,
- libiniparser-dev, pkg-config, cmake, libdrm-dev, libfuse-dev, libglib2.0-dev,
+ libiniparser-dev, pkg-config, cmake, libdrm-dev, libfuse-dev,
  linux-fvp-headers, libmrpsim-dev (>=2.3.4), libtinyxml2-dev, libncurses-dev
 Standards-Version: 3.8.2
 Homepage: https://research.samsung.com

diff --git a/debian/npu-engine-dev.install b/debian/npu-engine-dev.install
index 7d76e80..97744fb 100644 (file)
--- a/debian/npu-engine-dev.install
+++ b/debian/npu-engine-dev.install
@@ -1,3 +1,3 @@
 /opt/trinity/include/*
-/opt/trinity/lib/*.a
+/opt/trinity/lib/libnpu-engine*.a
 /opt/trinity/lib/pkgconfig/*.pc

diff --git a/debian/npu-engine.install b/debian/npu-engine.install
index 00eea45..1098d1e 100644 (file)
--- a/debian/npu-engine.install
+++ b/debian/npu-engine.install
@@ -1,2 +1,2 @@
-/opt/trinity/lib/*.so
+/opt/trinity/lib/libnpu-engine*.so
 /opt/trinity/etc/*.ini

diff --git a/packaging/npu-engine.spec b/packaging/npu-engine.spec
index c48519b..dd2526a 100644 (file)
--- a/packaging/npu-engine.spec
+++ b/packaging/npu-engine.spec
@@ -64,7 +64,7 @@ DESTDIR=%{buildroot} ninja install -C build %{?_smp_mflags}
 %files
 %manifest npu-engine.manifest
 %defattr(-,root,root,-)
-%{_libdir}/*.so
+%{_libdir}/libnpu-engine*.so
 %{_sysconfdir}/npu-engine.ini
 
 %package devel
@@ -77,7 +77,7 @@ This contains corresponding header files and .pc pkgconfig file.
 %manifest npu-engine.manifest
 %defattr(-,root,root,-)
 %{_includedir}/npu-engine/*.h
-%{_libdir}/*.a
+%{_libdir}/libnpu-engine*.a
 %{_libdir}/pkgconfig/*.pc
 
 %package example
@@ -90,6 +90,7 @@ Example application package for NPU Engine, including UnitTests and AppTest with
 %defattr(-,root,root,-)
 %{neexampledir}/unittests/*
 %{neexampledir}/apptests/*
+%{_libdir}/libnpumgr*.so
 
 %package utils
 Requires:      npu-engine = %{version}-%{release}

diff --git a/tests/apptests/meson.build b/tests/apptests/meson.build
index 59ef7d0..9df0814 100644 (file)
--- a/tests/apptests/meson.build
+++ b/tests/apptests/meson.build
@@ -124,4 +124,7 @@ executable ('apptest_tvn_triv2_preempt',
   install_dir : join_paths(ne_bindir, 'apptests')
 )
 
-subdir('npumgr')
+# npumgr is available on tizen env.
+if build_platform == 'tizen'
+  subdir('npumgr')
+endif