Module: Mesa Branch: master Commit: fc48ad24272799b154de37f6a944eb391bdbbb82 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc48ad24272799b154de37f6a944eb391bdbbb82
Author: Dylan Baker <[email protected]> Date: Wed Oct 4 16:11:34 2017 -0700 make: Fix test to be meson compatible This has the same problem as the previous commit, generated headers and hardcoded paths. Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Eric Anholt <[email protected]> --- src/mapi/Makefile.am | 2 ++ src/mapi/shared-glapi/tests/check_table.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am index 83e32d2185..3febe27d74 100644 --- a/src/mapi/Makefile.am +++ b/src/mapi/Makefile.am @@ -85,6 +85,7 @@ check_PROGRAMS += shared-glapi-test shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp shared_glapi_test_CPPFLAGS = \ $(AM_CPPFLAGS) \ + -I$(top_builddir)/src/mapi/glapi \ -I$(top_srcdir)/src/gtest/include shared_glapi_test_LDADD = \ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ @@ -148,6 +149,7 @@ check_PROGRAMS += glapi-test glapi_test_SOURCES = glapi/tests/check_table.cpp glapi_test_CPPFLAGS = \ $(AM_CPPFLAGS) \ + -I$(top_builddir)/src/mapi/glapi \ -I$(top_srcdir)/src/gtest/include glapi_test_LDADD = \ diff --git a/src/mapi/shared-glapi/tests/check_table.cpp b/src/mapi/shared-glapi/tests/check_table.cpp index 02d313c22d..314e6769b4 100644 --- a/src/mapi/shared-glapi/tests/check_table.cpp +++ b/src/mapi/shared-glapi/tests/check_table.cpp @@ -25,7 +25,7 @@ #include "../../../mesa/main/glheader.h" #include "glapi/glapi.h" -#include "glapi/glapitable.h" +#include "glapitable.h" struct name_offset { const char *name; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
