Mesa (master): tests/glx: Point at the imported copy of gtest

Ian Romanick idr at kemper.freedesktop.org
Fri Apr 13 00:22:16 UTC 2012


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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Mar 29 15:31:55 2012 -0700

tests/glx: Point at the imported copy of gtest

This is just in case there's one installed on the system.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>
Acked-by: Eric Anholt <eric at anholt.net>

---

 tests/glx/Makefile.am |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/glx/Makefile.am b/tests/glx/Makefile.am
index b5cc0b0..f5581d6 100644
--- a/tests/glx/Makefile.am
+++ b/tests/glx/Makefile.am
@@ -1,7 +1,10 @@
-AM_CFLAGS = -I$(top_builddir)/src/glx -I$(top_builddir)/src/mapi \
-	$(X11_CFLAGS) $(GTEST_CFLAGS)
-AM_CXXFLAGS = -I$(top_builddir)/src/glx -I$(top_builddir)/src/mapi \
-	$(X11_CFLAGS) $(GTEST_CFLAGS)
+INC = \
+	-I$(top_builddir)/src/gtest/include \
+	-I$(top_builddir)/src/mapi \
+	-I$(top_builddir)/src/glx
+
+AM_CFLAGS = $(INC) $(X11_CFLAGS)
+AM_CXXFLAGS = $(INC) $(X11_CFLAGS)
 
 if HAVE_XCB_GLX_CREATE_CONTEXT
 TESTS = glx_unittest




More information about the mesa-commit mailing list