glx/test: meson: assorted include fixes
authorEmil Velikov <emil.velikov@collabora.com>
Wed, 12 Dec 2018 19:24:14 +0000 (19:24 +0000)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 12 Dec 2018 19:24:14 +0000 (19:24 +0000)
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@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
src/glx/tests/meson.build

index 2420c90c43705bcda47314d764470c5b1e9681f3..68e1ca59c22aee4b4a624b35bd3ef2a6d4b784d2 100644 (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]
     ),
     suite : ['glx'],
   )