Mesa (master): mesa/st: Include builddir/src/compiler/ glsl to fix make check

Aaron Watry awatry at kemper.freedesktop.org
Tue Sep 12 01:21:34 UTC 2017


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

Author: Aaron Watry <awatry at gmail.com>
Date:   Sun Sep 10 13:05:35 2017 -0500

mesa/st: Include builddir/src/compiler/glsl to fix make check

Otherwise, when doing an out-of-tree build you can expect the following:

make[6]: Entering directory \
         '${MESA_SRC}/build/src/mesa/state_tracker/tests'
  CXX      test_glsl_to_tgsi_lifetime.o
In file included from \
    ${MESA_SRC}/src/mesa/src/mesa/state_tracker/st_glsl_to_tgsi_private.h:31:0,
  from \
    ${MESA_SRC}/src/mesa/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.h:27,
  from \
    ${MESA_SRC}/src/mesa/src/mesa/state_tracker/tests/test_glsl_to_tgsi_lifetime.cpp:24:
  ${MESA_SRC}/src/compiler/glsl/ir.h:1502:37: \
    fatal error: ir_expression_operation.h: No such file or directory
 #include "ir_expression_operation.h"

Signed-off-by: Aaron Watry <awatry at gmail.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Tested-by: Gert Wollny <gw.fossdev at gmail.com>

---

 src/mesa/state_tracker/tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/state_tracker/tests/Makefile.am b/src/mesa/state_tracker/tests/Makefile.am
index 12ae7fab10..cd610e0adf 100644
--- a/src/mesa/state_tracker/tests/Makefile.am
+++ b/src/mesa/state_tracker/tests/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/gallium/include \
 	-I$(top_srcdir)/src/gallium/auxiliary \
+	-I$(top_builddir)/src/compiler/glsl \
 	$(DEFINES)
 
 TESTS = st-renumerate-test




More information about the mesa-commit mailing list