[gnome-photos] build: Add gobject-2.0 as an explicit dependency
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] build: Add gobject-2.0 as an explicit dependency
- Date: Tue, 2 Oct 2018 20:14:41 +0000 (UTC)
commit d0012faf8a3337bd9c6539cb8558bfa1bf8c5304
Author: Debarshi Ray <debarshir gnome org>
Date: Tue Oct 2 19:02:43 2018 +0200
build: Add gobject-2.0 as an explicit dependency
... just like gio-2.0, glib-2.0, etc..
configure.ac | 1 +
meson.build | 1 +
src/Makefile.am | 3 +++
src/meson.build | 1 +
4 files changed, 6 insertions(+)
---
diff --git a/configure.ac b/configure.ac
index 1c3852d4..e399bdf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,7 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0])
PKG_CHECK_MODULES(GOA, [goa-1.0 >= $GOA_MIN_VERSION])
AC_DEFINE([GOA_API_IS_SUBJECT_TO_CHANGE], [], [We are aware that GOA's API can change])
+PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
PKG_CHECK_MODULES(GRILO, [grilo-0.3 >= $GRILO_MIN_VERSION])
PKG_CHECK_MODULES(GSETTINGS_DESKTOP_SCHEMAS, [gsettings-desktop-schemas])
PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_MIN_VERSION])
diff --git a/meson.build b/meson.build
index 3ff4f6aa..633cf56a 100644
--- a/meson.build
+++ b/meson.build
@@ -150,6 +150,7 @@ glib_dep = dependency('glib-2.0', version: '>= 2.44.0')
goa_dep = dependency('goa-1.0', version: '>= 3.8.0')
config_h.set('GOA_API_IS_SUBJECT_TO_CHANGE', true)
+gobject_dep = dependency('gobject-2.0')
grilo_dep = dependency('grilo-0.3', version: '>= 0.3.5')
gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas')
gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.16')
diff --git a/src/Makefile.am b/src/Makefile.am
index b13dfb6e..a20a112e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -414,6 +414,7 @@ AM_CPPFLAGS = \
$(GIO_CFLAGS) \
$(GLIB_CFLAGS) \
$(GOA_CFLAGS) \
+ $(GOBJECT_CFLAGS) \
$(GRILO_CFLAGS) \
$(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS) \
$(GTK_CFLAGS) \
@@ -444,6 +445,7 @@ gnome_photos_LDADD = \
$(GIO_LIBS) \
$(GLIB_LIBS) \
$(GOA_LIBS) \
+ $(GOBJECT_LIBS) \
$(GRILO_LIBS) \
$(GTK_LIBS) \
$(GTK_UNIX_PRINT_LIBS) \
@@ -465,6 +467,7 @@ gnome_photos_thumbnailer_LDADD = \
$(GDK_PIXBUF_LIBS) \
$(GIO_LIBS) \
$(GLIB_LIBS) \
+ $(GOBJECT_LIBS) \
$(JPEG_LIBS) \
$(PNG_LIBS) \
$(LIBM) \
diff --git a/src/meson.build b/src/meson.build
index 961558a3..5a832364 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -63,6 +63,7 @@ common_deps = [
gio_dep,
gio_unix_dep,
glib_dep,
+ gobject_dep,
libdazzle_dep,
libjpeg_dep,
libpng_dep,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]