[gtk+/wip/meson: 42/136] meson: Build gtk utils
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/meson: 42/136] meson: Build gtk utils
- Date: Fri, 28 Apr 2017 14:30:31 +0000 (UTC)
commit e7eb5460d575285e23f64fa7514adb9489acbe45
Author: Timm Bäder <mail baedert org>
Date: Sat Sep 24 10:43:22 2016 +0200
meson: Build gtk utils
demos/gtk-demo/meson.build | 3 +-
demos/icon-browser/meson.build | 3 +-
demos/widget-factory/meson.build | 3 +-
gtk/meson.build | 54 +++++++++++++++++++++++++++++++++++--
4 files changed, 57 insertions(+), 6 deletions(-)
---
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index c4cdd9c..11fe332 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -108,5 +108,6 @@ gtkdemo = executable(
gtkdemo_resources,
dependencies: gtkdemo_deps,
include_directories : confinc,
- gui_app: true
+ gui_app: true,
+ install: true
)
diff --git a/demos/icon-browser/meson.build b/demos/icon-browser/meson.build
index b5ef163..661e520 100644
--- a/demos/icon-browser/meson.build
+++ b/demos/icon-browser/meson.build
@@ -17,5 +17,6 @@ iconbrowser = executable(
iconbrowser_resources,
dependencies: libgtk_dep,
include_directories : confinc,
- gui_app: true
+ gui_app: true,
+ install: true
)
diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
index cd58b0e..170a59e 100644
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -15,5 +15,6 @@ widget_factory = executable(
widgetfactory_resources,
dependencies: libgtk_dep,
include_directories : confinc,
- gui_app: true
+ gui_app: true,
+ install: true
)
diff --git a/gtk/meson.build b/gtk/meson.build
index 34ce8e6..46fa1a9 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -806,11 +806,11 @@ gtk_deps = [
]
if x11_enabled
- runcmd = run_command('pkg-config', '--variable=pkgdatadir', 'wayland-protocols')
+ runcmd = run_command('pkg-config', '--variable=prefix', 'x11')
if runcmd.returncode() == 0
gtk_cargs += '-DX11_DATA_PREFIX="' + runcmd.stdout().strip() + '"'
else
- error('Could not get wayland-protocols pkgdatadir via pkg-config.')
+ error('Could not get x11 data prefix via pkg-config.')
endif
gtk_sources += [
@@ -834,11 +834,13 @@ if wayland_enabled
]
endif
+gnome.compile_schemas()
+
libgtk = shared_library('gtk',
gtk_sources,
gtkmarshal_h,
c_args: gtk_cargs,
- include_directories: [ confinc, gdkinc, gtkinc ],
+ include_directories: [confinc, gdkinc, gtkinc],
dependencies: [gtk_deps, libgdk_dep],
install: true
)
@@ -855,3 +857,49 @@ libgtk_dep = declare_dependency(
link_args: ['-Bsymbolic'],
include_directories: [confinc, gtkinc]
)
+
+
+
+####### Utils ######
+gtk_query_settings = executable(
+ 'gtk-query-settings',
+ 'gtk-query-settings.c',
+ dependencies: libgtk_dep,
+ install: true
+)
+
+gtk_builder_tool = executable(
+ 'gtk-builder-tool',
+ 'gtk-builder-tool.c',
+ dependencies: libgtk_dep,
+ install: true
+)
+
+gtk_update_icon_cache = executable(
+ 'gtk-update-icon-cache',
+ 'updateiconcache.c',
+ dependencies: libgtk_dep,
+ install: true
+)
+
+# gtk_query_immodules = executable(
+ # 'gtk-query-immodules-3.0',
+ # 'queryimmodules.c',
+ # 'gtkutils.c',
+ # dependencies: libgtk_dep,
+ # install: true
+# )
+
+gtk_encode_symbolic_svg = executable(
+ 'gtk-encode-symbolic-svg',
+ 'encodesymbolic.c',
+ dependencies: libgtk_dep,
+ install: true
+)
+
+gtk_launch = executable(
+ 'gtk-launch',
+ 'gtk-launch.c',
+ dependencies: libgtk_dep,
+ install: true
+)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]