diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-03-22 16:51:39 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-03 15:10:55 +0100 |
| commit | 3a496afa0be8b3a8d5183ef549f7239d3381739a (patch) | |
| tree | 7d42067e993585ee489c2494856297d7fe7ded46 /gtk | |
| parent | cbfaebfa830f1a51e41a3c903b804eaed8328ff4 (diff) | |
| download | gtk+-3a496afa0be8b3a8d5183ef549f7239d3381739a.tar.gz | |
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.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/meson.build | 14 |
1 files 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/' ) |