diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2017-08-08 13:46:13 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2017-08-08 13:52:14 +0100 |
| commit | 3252456452b716c27e42901b8d24242cac78044b (patch) | |
| tree | 862d02bd7f7d08ba4f8215780869f17372934bc1 | |
| parent | a817fa7b80eff541ff4db280603b19cb2e7106e2 (diff) | |
| download | colord-3252456452b716c27e42901b8d24242cac78044b.tar.gz | |
Replace the correct symbols in ch-version.h
When generating the ch-version.h header, we need to replace a set of
symbols at configuration time. The configuration_data object we are
using does not contain them.
Meson warns about this in newer versions:
WARNING: The variable(s) 'CD_MAJOR_VERSION', 'CD_MICRO_VERSION',
'CD_MINOR_VERSION' in the input file 'lib/colorhug/ch-version.h.in'
are not present in the given configuration data
And the generated header is also invalid.
| -rw-r--r-- | lib/colorhug/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build index 78868cf..1ee1ce8 100644 --- a/lib/colorhug/meson.build +++ b/lib/colorhug/meson.build @@ -2,10 +2,15 @@ cargs = [ '-DG_LOG_DOMAIN="libcolorhug"', ] +ch_version_h_conf = configuration_data() +ch_version_h_conf.set('CD_MAJOR_VERSION', colord_major_version) +ch_version_h_conf.set('CD_MINOR_VERSION', colord_minor_version) +ch_version_h_conf.set('CD_MICRO_VERSION', colord_micro_version) + colorhug_version_h = configure_file( input : 'ch-version.h.in', output : 'ch-version.h', - configuration : conf, + configuration : ch_version_h_conf, install : true, install_dir: join_paths(get_option('includedir'), 'colord-1/colorhug'), ) |