[libgda] Meson: add glade-ui installation
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Meson: add glade-ui installation
- Date: Mon, 16 Jul 2018 04:07:41 +0000 (UTC)
commit 0169b3d53629f2e619a17a1c477683da93649e65
Author: Daniel Espinosa <esodan gmail com>
Date: Sun Jul 15 22:43:56 2018 -0500
Meson: add glade-ui installation
Fix #14
libgda-ui/glade/meson.build | 15 +++++++++++++++
libgda-ui/meson.build | 3 +++
meson.build | 5 ++---
3 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/libgda-ui/glade/meson.build b/libgda-ui/glade/meson.build
new file mode 100644
index 000000000..cdf94169c
--- /dev/null
+++ b/libgda-ui/glade/meson.build
@@ -0,0 +1,15 @@
+
+install_data('gdaui-catalog.xml',
+ install_dir: glade_catalog
+ )
+
+glade_pixmapf = files([
+ 'widget-gdaui-gdauigrid.png',
+ 'widget-gdaui-gdauilogin.png',
+ 'widget-gdaui-gdauibasicform.png',
+ 'widget-gdaui-gdauicombo.png',
+ 'widget-gdaui-gdauirawgrid.png'
+ ])
+install_data(glade_pixmapf,
+ install_dir: glade_pixmap
+ )
diff --git a/libgda-ui/meson.build b/libgda-ui/meson.build
index 6ef6ae65b..2b706aee2 100644
--- a/libgda-ui/meson.build
+++ b/libgda-ui/meson.build
@@ -7,6 +7,9 @@ libgda_ui_deps = [
subdir('marshallers')
subdir('data-entries')
subdir('internal')
+if glade_dep.found()
+ subdir('glade')
+endif
libgda_ui_cargs = [
'-include',
diff --git a/meson.build b/meson.build
index 3331a7226..dbb48ba9d 100644
--- a/meson.build
+++ b/meson.build
@@ -162,7 +162,6 @@ c_args = ['-Wall',
glade_catalog = ''
glade_pixmap = ''
-pkg_module = import('pkgconfig')
gnome_module = import('gnome')
if get_option('enable-json')
@@ -255,8 +254,8 @@ int main() {
endif
if glade_dep.found()
- glade_catalog = pkg_module.generate(libraries: 'gladeui-2.0', variables : 'catalogdir')
- glade_catalog = pkg_module.generate(libraries: 'gladeui-2.0', variables : 'pixmapdir')
+ glade_catalog = glade_dep.get_pkgconfig_variable('catalogdir')
+ glade_pixmap = glade_dep.get_pkgconfig_variable('pixmapdir')
endif
subdir('libgda-ui')
subdir('libgda-report')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]