Mesa (master): glapi: fix check_table test for non-shared glapi with meson

Dylan Baker dbaker at kemper.freedesktop.org
Tue Feb 6 23:00:57 UTC 2018


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

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Mon Nov 20 14:55:13 2017 -0800

glapi: fix check_table test for non-shared glapi with meson

v2: - Add glapitable_h generated source to requirements

Fixes: 3218056e0eb3 ("meson: Build i965 and dri stack")
Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com> (v1)
Reviewed-by: Emil Velikov <emil.velikov at collabora.com> (v1)

---

 src/mapi/glapi/meson.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index 267cfe7e7b..e241d9ed38 100644
--- a/src/mapi/glapi/meson.build
+++ b/src/mapi/glapi/meson.build
@@ -82,9 +82,10 @@ if not with_shared_glapi and with_tests
     'glapi_static_check_table',
     executable(
       'glapi_static_check_table',
-      'tests/check_table.cpp',
+      ['tests/check_table.cpp', glapitable_h],
+      include_directories : [inc_include, inc_src, inc_mesa, inc_mapi],
       link_with : [libglapi_static],
-      dependencies : [idep_gtest],
+      dependencies : [idep_gtest, dep_thread],
     )
   )
 endif




More information about the mesa-commit mailing list