[PATCH i-g-t] meson: Fix IGT_GIT_SHA1 handling

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>

Tell meson about the dependency on version.h. Avoids the compiler
falling over on account of IGT_GIT_SHA1 not being there.

Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
---
 lib/meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/meson.build b/lib/meson.build
index 0d379d90d889..203be520fd3f 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 : [
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux