From 00fca07c3b09ead62b189fd02718ae2ddc825bfd Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 22 May 2018 14:57:14 -0700 Subject: [PATCH] meson: Add idep_getopt for tests There are quite a few tests that require getopt, when using MSVC we need to use the bundled version of getopt since there isn't a system version. Acked-by: Kristian H. Kristensen --- src/compiler/glsl/glcpp/meson.build | 2 +- src/compiler/glsl/meson.build | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build index 90046477108..28c836381e4 100644 --- a/src/compiler/glsl/glcpp/meson.build +++ b/src/compiler/glsl/glcpp/meson.build @@ -58,7 +58,7 @@ libglcpp = static_library( glcpp = executable( 'glcpp', 'glcpp.c', - dependencies : [dep_m], + dependencies : [dep_m, idep_getopt], include_directories : [inc_common], link_with : [libglcpp, libglsl_util], c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args], diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index 658256149fc..74cb8973077 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -240,7 +240,7 @@ libglsl_standalone = static_library( cpp_args : [cpp_vis_args, cpp_msvc_compat_args], include_directories : [inc_common], link_with : [libglsl, libglsl_util], - dependencies : idep_mesautil, + dependencies : [idep_mesautil, idep_getopt], build_by_default : false, ) @@ -249,7 +249,7 @@ glsl_compiler = executable( 'main.cpp', c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - dependencies : [dep_clock, dep_thread], + dependencies : [dep_clock, dep_thread, idep_getopt], include_directories : [inc_common], link_with : [libglsl_standalone], build_by_default : with_tools.contains('glsl'), @@ -263,7 +263,7 @@ glsl_test = executable( c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], include_directories : [inc_common], - dependencies : [dep_clock, dep_thread], + dependencies : [dep_clock, dep_thread, idep_getopt], link_with : [libglsl, libglsl_standalone, libglsl_util], build_by_default : with_tools.contains('glsl'), install : with_tools.contains('glsl'), -- 2.30.2