From 1db12466cb5ad8483cd469753d2e312a62d717b7 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 5 Dec 2017 11:16:50 +0100 Subject: meson: build a full dependency for lib_igt_perf meson prefers packages dependencies over passing arount static libraries, because those also include linker flags, include dirs and everything else. While at it pull the special cases out from the common build stanzas like we do with other special cases. Just a bit of ocd to keep everything polished. v2: Don't forget to add perf_pmu to the test list (Petri). Cc: Tvrtko Ursulin Reviewed-by: Petri Latvala Signed-off-by: Daniel Vetter --- overlay/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'overlay') diff --git a/overlay/meson.build b/overlay/meson.build index 6b479eb8..afacff5e 100644 --- a/overlay/meson.build +++ b/overlay/meson.build @@ -21,7 +21,8 @@ dri2proto = dependency('dri2proto', version : '>= 2.6', required : false) cairo_xlib = dependency('cairo-xlib', required : false) xrandr = dependency('xrandr', version : '>=1.3', required : false) -gpu_overlay_deps = [ realtime, math, cairo, pciaccess, libdrm, libdrm_intel ] +gpu_overlay_deps = [ realtime, math, cairo, pciaccess, libdrm, + libdrm_intel, lib_igt_perf ] both_x11_src = '' @@ -55,6 +56,5 @@ if xrandr.found() and cairo.found() include_directories : inc, c_args : gpu_overlay_cflags, dependencies : gpu_overlay_deps, - link_with : lib_igt_perf, install : true) endif -- cgit v1.2.3