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

Author: Dylan Baker <[email protected]>
Date:   Tue May 22 15:24:16 2018 -0700

meson: Don't build glsl cache_test when shader cache is disabled

v2: - Use new with_shader_cache variable instead of
      host_machine.system() == 'windows'

Reviewed-by: Eric Anholt <[email protected]>

---

 src/compiler/glsl/tests/meson.build | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/compiler/glsl/tests/meson.build 
b/src/compiler/glsl/tests/meson.build
index 02f3355c43c..a7a0a5b7c7f 100644
--- a/src/compiler/glsl/tests/meson.build
+++ b/src/compiler/glsl/tests/meson.build
@@ -30,19 +30,20 @@ test(
   suite : ['compiler', 'glsl'],
 )
 
-test(
-  'cache_test',
-  executable(
+if with_shader_cache
+  test(
     'cache_test',
-    'cache_test.c',
-    c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-    include_directories : [inc_common, inc_glsl],
-    link_with : [libglsl],
-    dependencies : [dep_clock, dep_thread],
-  ),
-  suite : ['compiler', 'glsl'],
-)
-
+    executable(
+      'cache_test',
+      'cache_test.c',
+      c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
+      include_directories : [inc_common, inc_glsl],
+      link_with : [libglsl],
+      dependencies : [dep_clock, dep_thread],
+    ),
+    suite : ['compiler', 'glsl'],
+  )
+endif
 
 test(
   'general_ir_test',

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to