From 3a496afa0be8b3a8d5183ef549f7239d3381739a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 22 Mar 2017 16:51:39 +0000 Subject: [PATCH] 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 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gtk/meson.build b/gtk/meson.build index 6bdf79912c..1b0cb53125 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -741,17 +741,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/' )