diff options
| author | Ben Iofel <iofelben@gmail.com> | 2017-08-01 00:09:44 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2017-08-01 12:12:39 +0100 |
| commit | 9f4386553e11a2bd312b9d38d5a35e91d649a650 (patch) | |
| tree | 09686a55d084598aae92c3a27181209e0b22d060 | |
| parent | 952a307af0277e9b58528f4791ceb6dbc442469a (diff) | |
| download | colord-9f4386553e11a2bd312b9d38d5a35e91d649a650.tar.gz | |
Fix the version numbers in cd-version.h to reflect reality
The gnome-settings-daemon project wasn't building.
Signed-off-by: Richard Hughes <richard@hughsie.com>
| -rw-r--r-- | lib/colord/cd-version.h.in | 6 | ||||
| -rw-r--r-- | lib/colord/meson.build | 7 | ||||
| -rw-r--r-- | meson.build | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/lib/colord/cd-version.h.in b/lib/colord/cd-version.h.in index 7dd2bb5..1f28549 100644 --- a/lib/colord/cd-version.h.in +++ b/lib/colord/cd-version.h.in @@ -41,21 +41,21 @@ * * The compile-time major version */ -#define CD_MAJOR_VERSION (@CD_MAJOR_VERSION@) +#define CD_MAJOR_VERSION (@CD_MAJOR_VERSION_PRIVATE@) /** * CD_MINOR_VERSION: * * The compile-time minor version */ -#define CD_MINOR_VERSION (@CD_MINOR_VERSION@) +#define CD_MINOR_VERSION (@CD_MINOR_VERSION_PRIVATE@) /** * CD_MICRO_VERSION: * * The compile-time micro version */ -#define CD_MICRO_VERSION (@CD_MICRO_VERSION@) +#define CD_MICRO_VERSION (@CD_MICRO_VERSION_PRIVATE@) /** * CD_CHECK_VERSION: diff --git a/lib/colord/meson.build b/lib/colord/meson.build index ed556ca..ae8e31e 100644 --- a/lib/colord/meson.build +++ b/lib/colord/meson.build @@ -2,10 +2,15 @@ cargs = [ '-DG_LOG_DOMAIN="libcolord"', ] +con2 = configuration_data() +con2.set('CD_MAJOR_VERSION_PRIVATE', colord_major_version) +con2.set('CD_MINOR_VERSION_PRIVATE', colord_minor_version) +con2.set('CD_MICRO_VERSION_PRIVATE', colord_micro_version) + colord_version_h = configure_file( input : 'cd-version.h.in', output : 'cd-version.h', - configuration : conf + configuration : con2 ) install_headers( diff --git a/meson.build b/meson.build index ba08e0c..d4bfdf1 100644 --- a/meson.build +++ b/meson.build @@ -11,9 +11,9 @@ colord_minor_version = varr[1] colord_micro_version = varr[2] conf = configuration_data() -conf.set('FWUPD_MAJOR_VERSION', colord_major_version) -conf.set('FWUPD_MINOR_VERSION', colord_minor_version) -conf.set('FWUPD_MICRO_VERSION', colord_micro_version) +conf.set('CD_MAJOR_VERSION_PRIVATE', colord_major_version) +conf.set('CD_MINOR_VERSION_PRIVATE', colord_minor_version) +conf.set('CD_MICRO_VERSION_PRIVATE', colord_micro_version) conf.set_quoted('PACKAGE_VERSION', colord_version) # libtool versioning - this applies to libcolord |