From 349ed63038fffe8835446a2f5bbea9d090f8ad51 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Wed, 24 Oct 2018 15:12:57 +0200 Subject: Use vcs_tag to get version information --- meson.build | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 0993749..b177e24 100644 --- a/meson.build +++ b/meson.build @@ -26,22 +26,26 @@ dep_plasma = declare_dependency( # Generate config header include = include_directories('include') -conf = configuration_data() -conf.set_quoted('poi_Version', '1.0.0') -conf.set_quoted('poi_Describe', '1.0.0-stable') -conf.set_quoted('poi_Build', 'custom-1.0.0') - -configure_file(configuration: conf, input: 'include/version.h.in', output: 'version.h') -genheader_inc = include_directories('.') +git = find_program('git').path() pymod = import('python') python3 = pymod.find_installation('python3') -kconfiggen = custom_target('configheader', - input: ['tools/config.py', 'src/Kconfig', 'linux/.config'], - output: 'config.h', - command: [python3, '@INPUT0@', '--kconfig=@INPUT1@', '--dotconfig=@INPUT2@', '--generate=@OUTPUT@'], - build_by_default: true +dep_genheaders = declare_dependency( + include_directories: include_directories('.'), + sources: [ + vcs_tag( + command: [git, 'describe', '--long', '--abbrev=40'], + #fallback: defaults to meson.project_version(), + input: 'include/version.h.in', + output: 'version.h' + ), + custom_target('configheader', + input: ['tools/config.py', 'src/Kconfig', 'linux/.config'], + output: 'config.h', + command: [python3, '@INPUT0@', '--kconfig=@INPUT1@', '--dotconfig=@INPUT2@', '--generate=@OUTPUT@'], + build_by_default: true + )] ) interfaces_moc = qt5.preprocess( -- cgit v1.2.1