From 0cd0d6e826ad69d3c81572755a9ca4ceff933a2e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 10 Jun 2021 14:22:10 +1000 Subject: [PATCH] meson.build: split the version data into a separate config Use this for the version.h file so we enforce that being used everywhere instead of accidentaly relying on whatever ends up in config.h. The generated version.h file is identical. --- meson.build | 12 +++++++----- src/pipewire/meson.build | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 141cd8161..bf10c5c3b 100644 --- a/meson.build +++ b/meson.build @@ -178,12 +178,14 @@ else error('8-byte atomic operations are required') endif +versiondata = configuration_data() +versiondata.set('PIPEWIRE_VERSION_MAJOR', pipewire_version_major) +versiondata.set('PIPEWIRE_VERSION_MINOR', pipewire_version_minor) +versiondata.set('PIPEWIRE_VERSION_MICRO', pipewire_version_micro) +versiondata.set('PIPEWIRE_VERSION_NANO', pipewire_version_nano) +versiondata.set_quoted('PIPEWIRE_API_VERSION', apiversion) + cdata = configuration_data() -cdata.set('PIPEWIRE_VERSION_MAJOR', pipewire_version_major) -cdata.set('PIPEWIRE_VERSION_MINOR', pipewire_version_minor) -cdata.set('PIPEWIRE_VERSION_MICRO', pipewire_version_micro) -cdata.set('PIPEWIRE_VERSION_NANO', pipewire_version_nano) -cdata.set_quoted('PIPEWIRE_API_VERSION', apiversion) cdata.set_quoted('PIPEWIRE_CONFDATADIR', pipewire_confdatadir) cdata.set_quoted('LOCALEDIR', pipewire_localedir) cdata.set_quoted('LIBDIR', pipewire_libdir) diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build index 860b226e8..c0fc14e44 100644 --- a/src/pipewire/meson.build +++ b/src/pipewire/meson.build @@ -80,7 +80,7 @@ pipewire_sources = [ configure_file(input : 'version.h.in', output : 'version.h', install_dir : get_option('includedir') / pipewire_headers_dir, - configuration : cdata) + configuration : versiondata) install_headers(pipewire_headers, subdir : pipewire_headers_dir)