[Build] remove glib dependency

We replaced all glib functions in nns-edge, remove glib dependency.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d259aed7681b14c1f70de2efe63c4fb09c9abd9..8f7325a74e8f5451a55514c4637b01ad7d9de793 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,16 +61,6 @@ IF(ENABLE_PAHO_MQTT)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_MQTT=1")
 ENDIF()
 
-# Check requires packages
-# TODO FIXME remove glib dependency
-SET(REQUIRES_LIST "glib-2.0")
-
-PKG_CHECK_MODULES(EDGE_REQUIRE_PKGS REQUIRED ${REQUIRES_LIST})
-
-FOREACH(flag ${EDGE_REQUIRE_PKGS_CFLAGS})
-    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
 ADD_SUBDIRECTORY(src)
 
 IF (ENABLE_TEST)

diff --git a/debian/control b/debian/control
index c44090813716774e476b584c72cd54af758c01d4..e60765a917811df83da795918f281270476dc8d4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: MyungJoo Ham <myungjoo.ham@samsung.com>
 Build-Depends: gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5 (>=5.4),
  debhelper (>=9), cmake, libpaho-mqtt-dev,
- libglib2.0-dev, libgtest-dev
+ libgtest-dev
 Standards-Version: 0.0.1
 Homepage: https://github.com/nnstreamer/nnstreamer-edge
 

diff --git a/packaging/nnstreamer-edge.spec b/packaging/nnstreamer-edge.spec
index 7b9887e4cb2daba9a536c5356629b1ec6756ba95..9adaf625437974acb1fef68913178048a8b660e8 100644 (file)
--- a/packaging/nnstreamer-edge.spec
+++ b/packaging/nnstreamer-edge.spec
@@ -29,9 +29,6 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(paho-mqtt-c)
 %endif
 
-# TODO remove glib
-BuildRequires:  glib2-devel
-
 %if 0%{?unit_test}
 BuildRequires:  gtest-devel
 BuildRequires:  procps

diff --git a/src/libnnstreamer-edge/nnstreamer-edge-common.h b/src/libnnstreamer-edge/nnstreamer-edge-common.h
index 37b37ea5957ef62a78ea90ba079a3a4b09040d06..920aa776416cf1689fac032a940714c6e6b2151c 100644 (file)
--- a/src/libnnstreamer-edge/nnstreamer-edge-common.h
+++ b/src/libnnstreamer-edge/nnstreamer-edge-common.h
@@ -15,7 +15,6 @@
 #ifndef __NNSTREAMER_EDGE_COMMON_H__
 #define __NNSTREAMER_EDGE_COMMON_H__
 
-#include <glib.h> /** @todo remove glib */
 #include "nnstreamer-edge.h"
 
 #ifdef __cplusplus

diff --git a/src/libnnstreamer-edge/nnstreamer-edge-util.h b/src/libnnstreamer-edge/nnstreamer-edge-util.h
index f3e08442121dabfcd8be20b09d29e6de8630a268..61065e91ef14a1bcd89989964db8915726f09d68 100644 (file)
--- a/src/libnnstreamer-edge/nnstreamer-edge-util.h
+++ b/src/libnnstreamer-edge/nnstreamer-edge-util.h
@@ -31,6 +31,14 @@ extern "C" {
 #define UNUSED(expr) do { (void)(expr); } while (0)
 #endif
 
+#ifndef TRUE
+#define TRUE (1)
+#endif
+
+#ifndef FALSE
+#define FALSE (0)
+#endif
+
 #define STR_IS_VALID(s) ((s) && (s)[0] != '\0')
 #define SAFE_FREE(p) do { if (p) { free (p); (p) = NULL; } } while (0)