diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2018-12-12 19:24:14 +0000 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2018-12-25 17:58:06 +0100 |
| commit | 3f04c31cfec2813ac3ea3f3bb1204c60dbd9390c (patch) | |
| tree | 7db7db812e802472c710f70a0c88fb75b874a371 | |
| parent | 3de8d15d1fb9f6e85441505d1651701ecbb8c608 (diff) | |
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@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
(cherry picked from commit f331419f262d3a0f270376cafbb9517b4627bb7a)
[Juan A. Suarez: resolve trivial conflicts]
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Conflicts:
src/glx/tests/meson.build
| -rw-r--r-- | src/glx/tests/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/tests/meson.build b/src/glx/tests/meson.build index 81a77c3a3f6..013cb82db76 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] ) ) endif |