From 2e93946e4e15cb8e7e978334cb62677f9ead82fe Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Fri, 15 Sep 2017 16:54:44 +0300 Subject: meson: Fix IGT_GIT_SHA1 handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tell meson about the dependency on version.h. Avoids the compiler falling over on account of IGT_GIT_SHA1 not being there. Reviewed-by: Jordan Justen Signed-off-by: Ville Syrjälä --- lib/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/meson.build') diff --git a/lib/meson.build b/lib/meson.build index 0d379d90..203be520 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -140,9 +140,9 @@ install_headers(lib_headers) pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools') srcdir = join_paths(meson.source_root(), 'tests') -vcs_tag(input : 'version.h.in', output : 'version.h', - fallback : 'NO-GIT', - command : [ 'git', 'log', '-n1', '--pretty=format:g%h' ] ) +lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', + fallback : 'NO-GIT', + command : [ 'git', 'log', '-n1', '--pretty=format:g%h' ] ) lib_intermediates = [] foreach f: lib_sources @@ -154,7 +154,7 @@ foreach f: lib_sources endif lib = static_library('igt-' + name, - f, + [ f, lib_version ], include_directories: inc, dependencies : lib_deps, c_args : [ -- cgit v1.2.3