[Mesa-dev] [PATCH 3/3] meson: Don't build glsl compiler tests unless OpenGL is enabled

Dylan Baker dylan at pnwbakers.com
Fri Oct 5 18:05:12 UTC 2018


Since there are no other users of the glsl compiler.
---
 src/compiler/glsl/glcpp/meson.build | 2 +-
 src/compiler/glsl/meson.build       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index 769406f5331..a03d589b370 100644
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -55,7 +55,7 @@ glcpp = executable(
   build_by_default : false,
 )
 
-if with_tests
+if with_any_opengl and with_tests
   modes = ['unix', 'windows', 'oldmac', 'bizarro']
   if dep_valgrind.found()
     modes += ['valgrind']
diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index 7e4dd2929a3..71b4c42e4d7 100644
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -258,6 +258,6 @@ glsl_test = executable(
   install : with_tools.contains('glsl'),
 )
 
-if with_tests
+if with_any_opengl and with_tests
   subdir('tests')
 endif
-- 
2.19.0



More information about the mesa-dev mailing list