[gnome-commander/googletest] Adds GOBJECT_CFLAGS variable for the unit tests
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander/googletest] Adds GOBJECT_CFLAGS variable for the unit tests
- Date: Sun, 29 Nov 2015 18:29:28 +0000 (UTC)
commit 6b2d0ae0fccf0bba62d90860cf283d63d7cb9a16
Author: Uwe Scholz <uwescholz src gnome org>
Date: Sun Nov 29 19:29:17 2015 +0100
Adds GOBJECT_CFLAGS variable for the unit tests
configure.ac | 3 +++
tests/Makefile.am | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6ea9a17..3c2c4f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,7 @@ AC_SUBST(EXIV2_REQ)
AC_SUBST(TAGLIB_REQ)
AC_SUBST(LIBGSF_REQ)
AC_SUBST(POPPLER_REQ)
+AC_SUBST(GOBJECT_CFLAGS)
dnl Check for glib
AC_MSG_CHECKING(if glib >= ${GLIB_REQ} exists)
@@ -90,6 +91,8 @@ else
AC_MSG_ERROR(no)
fi
+dnl Check for gobject
+PKG_CHECK_MODULES([GOBJECT],[gobject-2.0])
dnl Check for gmodule
AC_MSG_CHECKING(if gmodule >= ${GMODULE_REQ} exists)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9a57e16..510994f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS =
AM_CPPFLAGS = \
$(CC_WARNINGS) \
$(GLIB_CFLAGS) \
+ $(GOBJECT_CFLAGS) \
$(GTK_CFLAGS) \
$(GNOMEUI_CFLAGS) \
$(GTEST_CPPFLAGS) \
@@ -10,11 +11,11 @@ AM_CPPFLAGS = \
INTVLIBS = \
$(GLIB_LIBS) \
+ $(GOBJECT_CFLAGS) \
$(GTK_LIBS) \
$(GNOMEUI_LIBS) \
$(top_builddir)/src/intviewer/libgviewer.a \
- -lgtest \
- -lgobject-2.0
+ -lgtest
TESTS = \
iv_viewerwidget \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]