From 2b649b14e0a33bbc6de3675073189b386553eeff Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Tue, 11 Jun 2019 11:27:50 +0200
Subject: [PATCH] Fix version number, fix version.hxx generation

---
 meson.build     | 7 ++-----
 src/meson.build | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index 39c39d7..83800ad 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,8 @@
 project( 'loopp', ['c','cpp'],
   default_options : [
     'cpp_std=c++11',
-    ])
-
-conf_data = configuration_data()
-conf_data.set('version', '1.2.0')
-
+    ],
+    version: '1.2.1')
 
 if(get_option('tests') == true)
   add_project_arguments('-DBUILD_TESTS', language : 'cpp')
diff --git a/src/meson.build b/src/meson.build
index 9939eba..c3c6982 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,7 +1,8 @@
 version_hxx = vcs_tag(
     input  : 'version.hxx.in',
     output : 'version.hxx',
-    fallback: 'Version info could not be read.')
+    command: ['git', 'describe', '--dirty=+', '--match=release-*', '--tags'],
+    fallback: meson.project_version())
 
 if not get_option('unitTests')
   message('Create build config for publishing')