From 8f8a51ac5c110145b77f66c585c35f2d6b4997d6 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sat, 24 Aug 2024 22:38:35 +0900 Subject: [PATCH] etnaviv: build dependency for the etnaviv tests Resolves failures as: ... -o src/etnaviv/isa/tests/etnaviv_disasm.p/disasm.cpp.o -c ../src/etnaviv/isa/tests/disasm.cpp In file included from ../src/etnaviv/isa/tests/disasm.cpp:12: ../src/etnaviv/isa/asm.h:15:10: fatal error: etnaviv/isa/enums.h: No such file or directory 15 | #include "etnaviv/isa/enums.h" | ^~~~~~~~~~~~~~~~~~~~~ Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11740 Reviewed-by: Christian Gmeiner Signed-off-by: David Heidelberg Part-of: --- src/etnaviv/isa/meson.build | 5 +++++ src/etnaviv/isa/tests/meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/etnaviv/isa/meson.build b/src/etnaviv/isa/meson.build index 47e8b59f678..1a687e005d1 100644 --- a/src/etnaviv/isa/meson.build +++ b/src/etnaviv/isa/meson.build @@ -54,6 +54,11 @@ etnaviv_enums_h = custom_target( depend_files: [isa_depend_files, prog_enums_h], ) +idep_etnaviv_enums_h = declare_dependency( + sources : [etnaviv_enums_h], + include_directories : include_directories('.'), +) + encode_h = custom_target( 'encode.h', input: ['etnaviv.xml'], diff --git a/src/etnaviv/isa/tests/meson.build b/src/etnaviv/isa/tests/meson.build index b6fa65b6db1..ddf6374b9ae 100644 --- a/src/etnaviv/isa/tests/meson.build +++ b/src/etnaviv/isa/tests/meson.build @@ -9,7 +9,7 @@ test( pre_args, ], include_directories: [inc_etnaviv, inc_src], - dependencies : [idep_gtest, idep_libetnaviv_decode], + dependencies : [idep_gtest, idep_etnaviv_enums_h, idep_libetnaviv_decode], link_with : [libetnaviv_isa_rs, libetnaviv_encode], ) )