[planner: 4/40] build: Re-order dep checks to logical order
- From: Mart Raudsepp <mraudsepp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [planner: 4/40] build: Re-order dep checks to logical order
- Date: Thu, 3 Jun 2021 16:28:54 +0000 (UTC)
commit 603280d94fbd65056b35c00343e5a32923bf940b
Author: Mart Raudsepp <leio gentoo org>
Date: Wed Mar 4 11:16:47 2020 +0200
build: Re-order dep checks to logical order
meson.build | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3eb986e5..543f0615 100644
--- a/meson.build
+++ b/meson.build
@@ -28,16 +28,17 @@ configure_file(
)
toplevel_inc = include_directories('.')
-m_dep = cc.find_library('m', required: false)
-gconf_dep = dependency('gconf-2.0', version: '>= 2.10.0')
-gda_dep = dependency('libgda-3.0', version: '>= 1.0', required: get_option('database-gda'))
-glade_dep = dependency('libglade-2.0', version: '>= 2.3.0')
glib_dep = dependency('glib-2.0', version: '>= 2.38.0')
gmodule_dep = dependency('gmodule-2.0')
-gnomecanvas_dep = dependency('libgnomecanvas-2.0', version: '>=2.10.0')
gobject_dep = dependency('gobject-2.0')
gtk_dep = dependency('gtk+-2.0', version: '>= 2.24.0')
+gnomecanvas_dep = dependency('libgnomecanvas-2.0', version: '>=2.10.0')
+glade_dep = dependency('libglade-2.0', version: '>= 2.3.0')
+gconf_dep = dependency('gconf-2.0', version: '>= 2.10.0')
libxml_dep = dependency('libxml-2.0', version: '>= 2.6.27')
+m_dep = cc.find_library('m', required: false)
+
+gda_dep = dependency('libgda-3.0', version: '>= 1.0', required: get_option('database-gda'))
pygobject_dep = dependency('pygobject-2.0', required: get_option('python'))
pygtk_dep = dependency('pygtk-2.0', version: '>= 2.6.0', required: get_option('python'))
if pygtk_dep.found()
@@ -45,8 +46,10 @@ if pygtk_dep.found()
endif
python = pymod.find_installation('python2', required: get_option('python'))
python_dep = python.dependency()
+
libplanner_deps = [glib_dep, gmodule_dep, gobject_dep, libxml_dep, m_dep,]
planner_deps = [glib_dep, gobject_dep, gmodule_dep, gtk_dep, gnomecanvas_dep, glade_dep, gconf_dep]
+
subdir('po')
subdir('libplanner')
subdir('src')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]