Meson: Use gen-version for the meson project version

diff --git a/meson.build b/meson.build
index fe26e410003b183bc026b688ab73bd876b1f2ee7..b15bdd5d6653ef71c0898c3cf545d23877965c98 100644 (file)
--- 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 c0d689c73b19c41961d942bf410de05817b2fa89..d146dadb0df0e5844d32aa64e6319b3c5c50408b 100644 (file)
--- 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