From 94526d527203e32759e57fc3175d494ce931f7e4 Mon Sep 17 00:00:00 2001 From: Scoopta Date: Fri, 28 Feb 2020 22:02:10 -0800 Subject: [PATCH] Removed the version flag in favor of setting the project version --- meson.build | 4 ++-- meson_options.txt | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index b14e4d5..d89eaef 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('wofi', 'c', default_options : ['buildtype=release', 'warning_level=2']) +project('wofi', 'c', version : 'hg', default_options : ['buildtype=release', 'warning_level=2']) cc = meson.get_compiler('c') inc = include_directories('inc') @@ -9,7 +9,7 @@ dl = cc.find_library('dl') hg = find_program('hg', native : true, required : false) -version = get_option('version') +version = meson.project_version() if hg.found() version = run_command(hg, 'identify').stdout().strip() diff --git a/meson_options.txt b/meson_options.txt index 3d7f2f4..119b6ca 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,3 @@ -option('version', type : 'string', value : 'hg', description : 'The version to use if mercurial cannot be found') option('enable_run', type : 'boolean', value : true, description : 'Whether run mode should be enabled') option('enable_drun', type : 'boolean', value : true, description : 'Whether drun mode should be enabled') option('enable_dmenu', type : 'boolean', value : true, description : 'Whether dmenu mode should be enabled') \ No newline at end of file