From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Tue, 8 Aug 2023 20:41:34 +0000 (+0200)
Subject: Meson: Use gen-version for the meson project version
X-Git-Tag: rec-5.1.0-alpha1~80^2~272
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c7f7b58164a34262bced574e53fb4c1d2e610f2;p=thirdparty%2Fpdns.git

Meson: Use gen-version for the meson project version
---

diff --git a/meson.build b/meson.build
index fe26e41000..b15bdd5d66 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'pdns',
   ['c', 'cpp'],
-  # version: 4.7.0,             # TODO This should call builder-support/gen-version
+  version: run_command('builder-support' / 'gen-version', check: true).stdout().strip(),
   # license_files: 'LICENSE',   # TODO Meson 1.1.0
   meson_version: '>= 0.53',
   default_options: [
diff --git a/meson/summary/meson.build b/meson/summary/meson.build
index c0d689c73b..d146dadb0d 100644
--- a/meson/summary/meson.build
+++ b/meson/summary/meson.build
@@ -7,8 +7,7 @@ summary('C++ Compiler Command', cxx.cmd_array(), section: 'System')
 summary('Linker', cxx.get_linker_id(), section: 'System')
 
 summary('Name', meson.project_name(), section: 'PowerDNS')
-summary('Version', product_version, section: 'PowerDNS')
-# summary('Version', meson.project_version(), section: 'PowerDNS')
+summary('Version', meson.project_version(), section: 'PowerDNS')
 
 # summary('Source Root', meson.project_source_root(), section: 'PowerDNS') # TODO Meson 0.56
 # summary('Build Root', meson.project_build_root(), section: 'PowerDNS')   # TODO Meson 0.56