[gtk+/wip/meson: 151/215] meson: make sure gdk/gdkenumtypes.h is generated for users of libgtk_dep
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/meson: 151/215] meson: make sure gdk/gdkenumtypes.h is generated for users of libgtk_dep
- Date: Tue, 18 Apr 2017 13:45:19 +0000 (UTC)
commit 331921cd3c73149751c0e51e72ca34320df2a026
Author: Tim-Philipp Müller <tim centricular com>
Date: Sat Feb 11 20:15:25 2017 +0000
meson: make sure gdk/gdkenumtypes.h is generated for users of libgtk_dep
Add libgdk_dep as dependency to the libgtk_dep declare_dependency(), so
that the generated gdk includes are generated before anything is built
that tries to include gtk headers (such as various tests that don't depend
on gdk directly).
gtk/meson.build | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 741210c..f2eea60 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -796,10 +796,10 @@ libgtk_dep = declare_dependency(
gtktypebuiltins_c,
gtktypebuiltins_h,
],
- dependencies: gtk_deps,
- link_with: [libgtk, libgdk, libgsk],
+ dependencies: gtk_deps + [libgdk_dep, libgsk_dep],
+ link_with: libgtk,
link_args: ['-Bsymbolic'],
- include_directories: [confinc, gtkinc, gdkinc]
+ include_directories: [confinc, gtkinc]
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]