[Mesa-dev] [PATCH 7/8] glapi: Don't search through subdirs from glapitable.h

Dylan Baker dylan at pnwbakers.com
Tue Nov 21 18:14:36 UTC 2017


Quoting Eric Engestrom (2017-11-21 06:06:33)
> On Monday, 2017-11-20 15:12:51 -0800, Dylan Baker wrote:
> > Because meson won't put it in that folder.
> > 
> > Signed-off-by: Dylan Baker <dylanx.c.baker at intel.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 30f523ca5fb..6230f1273f3 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 47fce8a5b78..5c920b70236 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 \
> 
> do we need srcdir here?

I might have misunderstood Emil, but I think it is needed for building from a
tarball. CCing Emil for clarification.

> 
> Other than that, the series is
> Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
> 
> >       -I$(top_builddir)/src/mesa \
> >       -I$(top_srcdir)/src/mesa \
> >       -I$(top_srcdir)/include \
> > -- 
> > 2.15.0
> > 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171121/b5494e5d/attachment.sig>


More information about the mesa-dev mailing list