[gtk+/wip/meson] meson: gtk: don't overwrite top-level cdata variable with local stuff
- From: Tim-Philipp Müller <tpm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/meson] meson: gtk: don't overwrite top-level cdata variable with local stuff
- Date: Wed, 22 Mar 2017 17:30:13 +0000 (UTC)
commit b1ae122099d1ddea294e322d8e914d7e0a3f5cbf
Author: Tim-Philipp Müller <tim centricular com>
Date: Wed Mar 22 16:51:39 2017 +0000
meson: gtk: don't overwrite top-level cdata variable with local stuff
We need to set the global configuration data written into
config.h from the modules/printbackends meson file.
gtk/meson.build | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 9f44180..bbd15c9 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -738,17 +738,17 @@ typefuncs = custom_target('gtktypefuncs.inc',
install: false,
)
-cdata = configuration_data()
-cdata.set('GTK_MAJOR_VERSION', gtk_major_version)
-cdata.set('GTK_MINOR_VERSION', gtk_minor_version)
-cdata.set('GTK_MICRO_VERSION', gtk_micro_version)
-cdata.set('GTK_BINARY_AGE', gtk_binary_age)
-cdata.set('GTK_INTERFACE_AGE', gtk_interface_age)
+gtkversion_cdata = configuration_data()
+gtkversion_cdata.set('GTK_MAJOR_VERSION', gtk_major_version)
+gtkversion_cdata.set('GTK_MINOR_VERSION', gtk_minor_version)
+gtkversion_cdata.set('GTK_MICRO_VERSION', gtk_micro_version)
+gtkversion_cdata.set('GTK_BINARY_AGE', gtk_binary_age)
+gtkversion_cdata.set('GTK_INTERFACE_AGE', gtk_interface_age)
gtkversion = configure_file(
input : 'gtkversion.h.in',
output : 'gtkversion.h',
- configuration: cdata,
+ configuration: gtkversion_cdata,
install_dir: 'include/gtk-4.0/gtk/'
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]