fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glx/test: meson: assorted include fixes

Browse source 
Swap '..' with the symbolic inc_glx and add glproto as dependency. That
will pull the correct include, effectively fixing the tests on macOS.

Fixes: a47c525f32 ("meson: build glx")
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
(cherry picked from commit f331419f26)
[Juan A. Suarez: resolve trivial conflicts]
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>

Conflicts:
	src/glx/tests/meson.build
This commit is contained in:
Emil Velikov 2018-12-12 19:24:14 +00:00 • committed by Juan A. Suarez Romero
parent 3de8d15d1f
commit 3f04c31cfe
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/glx/tests/meson.build
View file

@ -46,9 +46,9 @@ if with_shared_glapi
link_with : [libglx, libglapi],
include_directories : [
inc_src, inc_include, inc_mesa, inc_mapi, inc_gl_internal,
include_directories('..'),
inc_glx,
],
dependencies : [dep_libdrm, dep_thread, idep_gtest]
dependencies : [dep_libdrm, dep_glproto, dep_thread, idep_gtest]
)
)
endif