[Mesa-dev] [PATCH 34/48] meson: Add idep_getopt for tests
Dylan Baker
dylan at pnwbakers.com
Mon Jun 11 22:56:01 UTC 2018
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.
---
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 80f51a3e48e..3ab8ddee7f0 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 055a84714c1..238b5815f6f 100644
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -222,7 +222,7 @@ libglsl_standalone = static_library(
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common],
link_with : [libglsl, libglsl_util, libmesa_util],
- dependencies : [dep_thread],
+ dependencies : [dep_thread, idep_getopt],
build_by_default : false,
)
@@ -231,7 +231,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'),
@@ -245,7 +245,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.17.1
More information about the mesa-dev
mailing list