gitlab-ci: Merge ccache and libxml2-utils into main apt-get install

[mesa.git] / src / compiler / glsl / glcpp / meson.build

diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index 28c836381e43c8853a17e65515e7cf940f57065b..9fc8d9d02869e5439c2a797a7fd8cc5d9894b286 100644 (file)
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -47,7 +47,8 @@ endif
 
 libglcpp = static_library(
   'glcpp',
-  [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')],
+  [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c',
+                                 'pp_standalone_scaffolding.c')],
   dependencies : idep_mesautil,
   include_directories : [inc_common],
   c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args],
@@ -65,7 +66,8 @@ glcpp = executable(
   build_by_default : false,
 )
 
-if with_any_opengl and with_tests
+# FIXME: these fail on windows due to whitespace differences
+if with_any_opengl and with_tests and host_machine.system() != 'windows'
   modes = ['unix', 'windows', 'oldmac', 'bizarro']
   if dep_valgrind.found()
     modes += ['valgrind']