summaryrefslogtreecommitdiffstats
path: root/src/intel/common
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2019-07-22 14:50:15 +0100
committerEric Engestrom <eric@engestrom.ch>2019-08-03 00:08:37 +0000
commitd2d85b950d78c553b2694cda9ef0cc7bf9a0f737 (patch)
treeafdd28e30b66064b8b540a6e9d6d0ecbe27a6678 /src/intel/common
parent8ddb38209d51c53d6e5792b04b97814dfce9bce6 (diff)
meson: replace libmesa_util with idep_mesautil
This automates the include_directories and dependencies tracking so that all users of libmesa_util don't need to add them manually. Next commit will remove the ones that were only added for that reason. Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Acked-by: Eric Anholt <eric@anholt.net> Tested-by: Vinson Lee <vlee@freedesktop.org>
Diffstat (limited to 'src/intel/common')
-rw-r--r--src/intel/common/meson.build7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index 61fd35d5ef8..3d6a6de3853 100644
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -58,8 +58,8 @@ if install_intel_gpu_tests
'-DGEN_VERSIONx10=@0@'.format(g[0])
],
include_directories : [inc_common, inc_intel],
- link_with : [libintel_dev, libmesa_util],
- dependencies : [dep_libdrm, dep_thread, idep_gtest, idep_genxml],
+ link_with : [libintel_dev],
+ dependencies : [dep_libdrm, dep_thread, idep_gtest, idep_genxml, idep_mesautil],
install : install_intel_gpu_tests,
)
endforeach
@@ -85,7 +85,8 @@ if with_tests
'genxml_test',
['tests/genxml_test.c', gentest_pack],
include_directories : [inc_common, inc_intel],
- link_with : [libintel_common, libmesa_util],
+ dependencies : idep_mesautil,
+ link_with : libintel_common,
c_args : [
'-DGENXML_PATH="@0@"'.format(genxml_path)
],