meson: add idep_mesautil to components using simple_mtx.h
If valgrind is installed, these components need to find valgrind.h.
Fixes: 53f7d539cd
("util: Add helgrind support for simple_mtx")
Closes: #3876
Acked-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
parent
37a706ad5d
commit
a1281f8a99
|
@ -71,7 +71,7 @@ libglcpp_standalone = static_library(
|
|||
glcpp = executable(
|
||||
'glcpp',
|
||||
'glcpp.c',
|
||||
dependencies : [dep_m, idep_getopt],
|
||||
dependencies : [dep_m, idep_getopt, idep_mesautil],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
|
||||
link_with : [libglcpp_standalone, libglsl_util],
|
||||
c_args : [no_override_init_args, c_msvc_compat_args],
|
||||
|
|
|
@ -46,7 +46,7 @@ test(
|
|||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
|
||||
link_with : [libglsl, libglsl_standalone, libglsl_util],
|
||||
dependencies : [dep_clock, dep_thread, idep_gtest],
|
||||
dependencies : [dep_clock, dep_thread, idep_gtest, idep_mesautil],
|
||||
),
|
||||
suite : ['compiler', 'glsl'],
|
||||
)
|
||||
|
@ -62,7 +62,7 @@ test(
|
|||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
|
||||
link_with : [libglsl, libglsl_util],
|
||||
dependencies : [dep_thread, idep_gtest],
|
||||
dependencies : [dep_thread, idep_gtest, idep_mesautil],
|
||||
),
|
||||
suite : ['compiler', 'glsl'],
|
||||
)
|
||||
|
@ -76,7 +76,7 @@ test(
|
|||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
|
||||
link_with : [libglsl, libglsl_util],
|
||||
dependencies : [dep_thread, idep_gtest],
|
||||
dependencies : [dep_thread, idep_gtest, idep_mesautil],
|
||||
),
|
||||
suite : ['compiler', 'glsl'],
|
||||
)
|
||||
|
|
|
@ -24,7 +24,7 @@ libetnaviv_noop_drm_shim = shared_library(
|
|||
'etnaviv_noop_drm_shim',
|
||||
'etnaviv_noop.c',
|
||||
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
|
||||
dependencies: dep_drm_shim,
|
||||
dependencies: [dep_drm_shim, idep_mesautil],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
install : true,
|
||||
)
|
||||
|
|
|
@ -72,6 +72,6 @@ libpipe_loader_dynamic = static_library(
|
|||
],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
link_with : [libpipe_loader_links],
|
||||
dependencies : [dep_libdrm, idep_xmlconfig],
|
||||
dependencies : [dep_libdrm, idep_xmlconfig, idep_mesautil],
|
||||
build_by_default : false,
|
||||
)
|
||||
|
|
|
@ -110,7 +110,7 @@ libetnaviv = static_library(
|
|||
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv,
|
||||
],
|
||||
link_with: libetnaviv_drm,
|
||||
dependencies : [dep_libdrm, idep_nir_headers],
|
||||
dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil],
|
||||
)
|
||||
|
||||
etnaviv_compiler = executable(
|
||||
|
|
|
@ -99,7 +99,7 @@ liblima = static_library(
|
|||
inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
|
||||
inc_panfrost
|
||||
],
|
||||
dependencies : [dep_libdrm, idep_nir_headers],
|
||||
dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil],
|
||||
)
|
||||
|
||||
driver_lima = declare_dependency(
|
||||
|
|
|
@ -126,7 +126,7 @@ libr300 = static_library(
|
|||
inc_mesa,
|
||||
],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies : [dep_libdrm_radeon, dep_llvm],
|
||||
dependencies : [dep_libdrm_radeon, dep_llvm, idep_mesautil],
|
||||
)
|
||||
|
||||
driver_r300 = declare_dependency(
|
||||
|
|
|
@ -104,7 +104,7 @@ libradeonsi = static_library(
|
|||
],
|
||||
c_args : ['-Wstrict-overflow=0'],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies : [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers, idep_amdgfxregs_h],
|
||||
dependencies : [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers, idep_amdgfxregs_h, idep_mesautil],
|
||||
)
|
||||
|
||||
driver_radeonsi = declare_dependency(
|
||||
|
|
|
@ -87,6 +87,7 @@ libsvga = static_library(
|
|||
inc_src, inc_include, inc_gallium, inc_gallium_aux,
|
||||
include_directories('include')
|
||||
],
|
||||
dependencies : idep_mesautil,
|
||||
)
|
||||
|
||||
driver_svga = declare_dependency(
|
||||
|
|
|
@ -397,7 +397,7 @@ libmesaswr = static_library(
|
|||
],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, swr_incs],
|
||||
dependencies : dep_llvm,
|
||||
dependencies : [dep_llvm, idep_mesautil],
|
||||
)
|
||||
|
||||
link_libs = [libmesaswr]
|
||||
|
|
|
@ -33,7 +33,7 @@ libtegra = static_library(
|
|||
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
|
||||
inc_gallium_winsys,
|
||||
],
|
||||
dependencies : dep_libdrm,
|
||||
dependencies : [dep_libdrm, idep_mesautil],
|
||||
)
|
||||
|
||||
driver_tegra = declare_dependency(
|
||||
|
|
|
@ -37,7 +37,7 @@ libvirgl = static_library(
|
|||
[ files_libvirgl ],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio],
|
||||
dependencies : dep_libdrm
|
||||
dependencies : [dep_libdrm, idep_mesautil],
|
||||
)
|
||||
|
||||
driver_virgl = declare_dependency(
|
||||
|
|
|
@ -23,7 +23,7 @@ test(
|
|||
executable(
|
||||
'virgl_staging_mgr_test',
|
||||
files('virgl_staging_mgr_test.cpp'),
|
||||
dependencies : [dep_thread, idep_gtest],
|
||||
dependencies : [dep_thread, idep_gtest, idep_mesautil],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio, include_directories('..')],
|
||||
link_with : [libvirgl, libgallium],
|
||||
),
|
||||
|
|
|
@ -66,7 +66,7 @@ libzink = static_library(
|
|||
[files_libzink, zink_device_info, zink_nir_algebraic_c],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_vulkan_wsi, inc_vulkan_util],
|
||||
dependencies: [dep_vulkan, idep_nir_headers],
|
||||
dependencies: [dep_vulkan, idep_nir_headers, idep_mesautil],
|
||||
)
|
||||
|
||||
driver_zink = declare_dependency(
|
||||
|
|
|
@ -72,7 +72,7 @@ libclllvm = static_library(
|
|||
)),
|
||||
],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies : [dep_llvm, dep_elf, dep_llvmspirvlib],
|
||||
dependencies : [dep_llvm, dep_elf, dep_llvmspirvlib, idep_mesautil],
|
||||
)
|
||||
|
||||
libclspirv = static_library(
|
||||
|
@ -81,7 +81,7 @@ libclspirv = static_library(
|
|||
include_directories : clover_incs,
|
||||
cpp_args : [clover_opencl_cpp_args, clover_spirv_cpp_args],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies : [dep_spirv_tools],
|
||||
dependencies : [dep_spirv_tools, idep_mesautil],
|
||||
)
|
||||
|
||||
libclnir = static_library(
|
||||
|
@ -161,4 +161,5 @@ libclover = static_library(
|
|||
],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
link_with : [libclllvm, libclspirv, libclnir],
|
||||
dependencies : idep_mesautil,
|
||||
)
|
||||
|
|
|
@ -69,5 +69,5 @@ libomx_st = static_library(
|
|||
c_args : ['-fcommon'],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : inc_st_omx,
|
||||
dependencies : dep_st_omx,
|
||||
dependencies : [dep_st_omx, idep_mesautil],
|
||||
)
|
||||
|
|
|
@ -53,7 +53,7 @@ libgallium_dri = shared_library(
|
|||
libswkmsdri,
|
||||
],
|
||||
dependencies : [
|
||||
dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig,
|
||||
dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig, idep_mesautil,
|
||||
driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
|
||||
driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv,
|
||||
driver_tegra, driver_i915, driver_svga, driver_virgl,
|
||||
|
|
|
@ -24,6 +24,7 @@ libgraw_util = static_library(
|
|||
c_args : [c_msvc_compat_args],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
|
||||
dependencies : idep_mesautil,
|
||||
)
|
||||
|
||||
libgraw_null = shared_library(
|
||||
|
|
|
@ -31,5 +31,5 @@ libamdgpuwinsys = static_library(
|
|||
],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
link_with : libamdgpu_addrlib,
|
||||
dependencies : [dep_llvm, dep_libdrm_amdgpu, idep_amdgfxregs_h],
|
||||
dependencies : [dep_llvm, dep_libdrm_amdgpu, idep_amdgfxregs_h, idep_mesautil],
|
||||
)
|
||||
|
|
|
@ -26,5 +26,5 @@ libetnavivdrm = static_library(
|
|||
inc_etnaviv,
|
||||
],
|
||||
link_with: libetnaviv_drm,
|
||||
dependencies : [dep_libdrm, idep_nir_headers],
|
||||
dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil],
|
||||
)
|
||||
|
|
|
@ -26,4 +26,5 @@ liblimawinsys = static_library(
|
|||
inc_src, inc_include,
|
||||
inc_gallium, inc_gallium_aux, inc_gallium_drivers,
|
||||
],
|
||||
dependencies : idep_mesautil,
|
||||
)
|
||||
|
|
|
@ -25,5 +25,5 @@ libradeonwinsys = static_library(
|
|||
'radeon_drm_winsys.c', 'radeon_drm_winsys.h'),
|
||||
include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies : [dep_libdrm_radeon],
|
||||
dependencies : [dep_libdrm_radeon, idep_mesautil],
|
||||
)
|
||||
|
|
|
@ -43,5 +43,5 @@ libsvgadrm = static_library(
|
|||
inc_src, inc_include, inc_gallium, inc_gallium_aux,
|
||||
include_directories('../../../drivers/svga', '../../../drivers/svga/include'),
|
||||
],
|
||||
dependencies : dep_libdrm,
|
||||
dependencies : [dep_libdrm, idep_mesautil],
|
||||
)
|
||||
|
|
|
@ -25,6 +25,7 @@ libtegradrm = static_library(
|
|||
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
|
||||
inc_gallium_winsys
|
||||
],
|
||||
dependencies : idep_mesautil,
|
||||
)
|
||||
|
||||
driver_tegra = declare_dependency(
|
||||
|
|
|
@ -26,4 +26,5 @@ libv3dwinsys = static_library(
|
|||
inc_gallium, inc_gallium_aux, inc_gallium_drivers,
|
||||
],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
dependencies : idep_mesautil,
|
||||
)
|
||||
|
|
|
@ -22,6 +22,6 @@ libvirgldrm = static_library(
|
|||
'virgldrm',
|
||||
'virgl_drm_winsys.c',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_virtio],
|
||||
dependencies : [dep_libdrm, dep_libvirglcommon],
|
||||
dependencies : [dep_libdrm, dep_libvirglcommon, idep_mesautil],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
)
|
||||
|
|
|
@ -22,6 +22,6 @@ libvirglvtest = static_library(
|
|||
'virglvtest',
|
||||
['virgl_vtest_socket.c', 'virgl_vtest_winsys.c'],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_virtio],
|
||||
dependencies : dep_libvirglcommon,
|
||||
dependencies : [dep_libvirglcommon, idep_mesautil],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
)
|
||||
|
|
|
@ -23,5 +23,5 @@ libswrast_dri = static_library(
|
|||
files('swrast.c', 'swrast_priv.h'),
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common],
|
||||
dependencies : dep_libdrm,
|
||||
dependencies : [dep_libdrm, idep_mesautil],
|
||||
)
|
||||
|
|
|
@ -39,7 +39,7 @@ test(
|
|||
'main_test',
|
||||
[files_main_test, main_dispatch_h],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa],
|
||||
dependencies : [idep_gtest, dep_clock, dep_dl, dep_thread],
|
||||
dependencies : [idep_gtest, dep_clock, dep_dl, dep_thread, idep_mesautil],
|
||||
link_with : [libmesa_classic, link_main_test],
|
||||
),
|
||||
suite : ['mesa'],
|
||||
|
|
|
@ -22,7 +22,7 @@ libmesa_st_test_common = static_library(
|
|||
'mesa_st_test_common',
|
||||
['st_tests_common.cpp', ir_expression_operation_h],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
|
||||
dependencies : idep_gtest,
|
||||
dependencies : [idep_gtest, idep_mesautil],
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
Loading…
Reference in New Issue