Mesa (master): glx/test: meson: assorted include fixes

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f331419f262d3a0f270376cafbb9517b4627bb7a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f331419f262d3a0f270376cafbb9517b4627bb7a

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Dec 12 19:24:14 2018 +0000

glx/test: meson: assorted include fixes

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>
Reviewed-by: Dylan Baker <dylan at pnwbakers.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 2420c90c43..68e1ca59c2 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'],
   )