[Mesa-dev] [PATCH v2 02/12] make: Fix test to be meson compatible

Dylan Baker dylan at pnwbakers.com
Thu Oct 5 17:12:20 UTC 2017


This has the same problem as the previous commit, generated headers and
hardcoded paths.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 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 83e32d2185e..3febe27d74f 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 02d313c22d3..314e6769b49 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;
-- 
2.14.1



More information about the mesa-dev mailing list