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.
This commit is contained in:
Tim-Philipp Müller 2017-03-22 16:51:39 +00:00 committed by Emmanuele Bassi
parent cbfaebfa83
commit 3a496afa0b

View File

@ -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/'
)