[Mesa-dev] [PATCH 06/18] glx/test: meson: assorted include fixes

Dylan Baker dylan at pnwbakers.com
Fri Dec 14 17:41:01 UTC 2018


Quoting Emil Velikov (2018-12-13 08:05:55)
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Swap '..' with the symbolic inc_glx and add glproto as dependency. That
> will pull the correct include, effectively fixing the tests on macOS.
> 
> Fixes: a47c525f328 ("meson: build glx")
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/glx/tests/meson.build | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/glx/tests/meson.build b/src/glx/tests/meson.build
> index 2420c90c437..68e1ca59c22 100644
> --- a/src/glx/tests/meson.build
> +++ b/src/glx/tests/meson.build
> @@ -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]
>      ),
>      suite : ['glx'],
>    )
> -- 
> 2.19.2
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20181214/a60dcd0d/attachment.sig>


More information about the mesa-dev mailing list