Mesa (master): glapi: Don't search through subdirs from glapitable.h
Dylan Baker
dbaker at kemper.freedesktop.org
Tue Feb 6 23:00:57 UTC 2018
Module: Mesa
Branch: master
Commit: 002fbde71eb411521bdceb6dde772c6e21df0f1e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=002fbde71eb411521bdceb6dde772c6e21df0f1e
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Mon Nov 20 14:54:30 2017 -0800
glapi: Don't search through subdirs from glapitable.h
Because meson won't put it in that folder.
Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
src/mapi/glapi/tests/check_table.cpp | 2 +-
src/mesa/main/tests/Makefile.am | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp
index 30f523ca5f..6230f1273f 100644
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -25,7 +25,7 @@
#include "main/glheader.h"
#include "glapi/glapi.h"
-#include "glapi/glapitable.h"
+#include "glapitable.h"
struct name_offset {
const char *name;
diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am
index a8395d925b..94266a1d4a 100644
--- a/src/mesa/main/tests/Makefile.am
+++ b/src/mesa/main/tests/Makefile.am
@@ -4,6 +4,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gtest/include \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/mapi \
+ -I$(top_builddir)/src/mapi/glapi \
+ -I$(top_srcdir)/src/mapi/glapi \
-I$(top_builddir)/src/mesa \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/include \
More information about the mesa-commit
mailing list