Mesa (master): meson: Don't build glsl compiler tests unless OpenGL is enabled

[GitLab Mirror]

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

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Fri Oct  5 09:37:32 2018 -0700

meson: Don't build glsl compiler tests unless OpenGL is enabled

Since there are no other users of the glsl compiler.

Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

---

 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 769406f533..a03d589b37 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 7e4dd2929a..71b4c42e4d 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