Mesa (master): Fix make check

[Marek Olšák]

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

Author: Marek Olšák 
Date:   Thu Apr 12 20:03:12 2018 -0400

Fix make check

---

 src/compiler/glsl/test_optpass.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/compiler/glsl/test_optpass.cpp 
b/src/compiler/glsl/test_optpass.cpp
index 5fd1b2b675..1fd9db102c 100644
--- a/src/compiler/glsl/test_optpass.cpp
+++ b/src/compiler/glsl/test_optpass.cpp
@@ -42,6 +42,7 @@
 #include "program.h"
 #include "ir_reader.h"
 #include "standalone_scaffolding.h"
+#include "main/mtypes.h"
 
 using namespace std;
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): Fix 'make check' in src/mapi/glapi/tests when builddir != srcdir

[Jon TURNEY]

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

Author: Jon TURNEY jon.tur...@dronecode.org.uk
Date:   Fri Nov  8 13:22:54 2013 +

Fix 'make check' in src/mapi/glapi/tests when builddir != srcdir

make[5]: Entering directory `/jhbuild/build/mesa/mesa/src/mapi/glapi/tests'
  CXX  check_table.o
/jhbuild/checkout/mesa/mesa/src/mapi/glapi/tests/check_table.cpp:29:30: fatal 
error: glapi/glapitable.h: No such file or directory

We should look for the generated file glapi/glapitable.h in builddir, not srcdir

Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk

---

 src/mapi/glapi/tests/Makefile.am |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mapi/glapi/tests/Makefile.am b/src/mapi/glapi/tests/Makefile.am
index 26149c9..da1094b 100644
--- a/src/mapi/glapi/tests/Makefile.am
+++ b/src/mapi/glapi/tests/Makefile.am
@@ -3,6 +3,7 @@ AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
$(DEFINES) \
-I$(top_srcdir)/src/gtest/include \
+   -I$(top_builddir)/src/mapi \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/include
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit