summaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
authorScott D Phillips <[email protected]>2018-02-07 16:55:24 -0800
committerScott D Phillips <[email protected]>2018-02-08 11:24:42 -0800
commit1f4d2433e73a0a6d4e2a180de407970d983309db (patch)
treeee69bacbb0af123566f2d2c4320127626cd5cca9 /src/compiler
parent464d057c86ab36db81590aa940902ff7e29894da (diff)
meson: Add build option for tools
Add a build option to control building some of the misc tools we have. Also set the executables to install, presumably you want that if you're asking for the build. v2: set 'install:' to the with_tools value, not true (Jordan) handle 'all' in a the comma list (Dylan) Add freedreno's tools (Dylan) Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/glsl/meson.build6
-rw-r--r--src/compiler/meson.build3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index b0c0de810a6..26ab4f1c8d3 100644
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -230,7 +230,8 @@ glsl_compiler = executable(
dependencies : [dep_clock, dep_thread],
include_directories : [inc_common],
link_with : [libglsl_standalone],
- build_by_default : false,
+ build_by_default : with_tools.contains('glsl'),
+ install : with_tools.contains('glsl'),
)
glsl_test = executable(
@@ -242,7 +243,8 @@ glsl_test = executable(
include_directories : [inc_common],
dependencies : [dep_clock, dep_thread],
link_with : [libglsl, libglsl_standalone, libglsl_util],
- build_by_default : false,
+ build_by_default : with_tools.contains('glsl'),
+ install : with_tools.contains('glsl'),
)
if with_tests
diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index d86bdde61d8..e955e66f811 100644
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -62,7 +62,8 @@ spirv2nir = executable(
include_directories : [inc_common, inc_nir, include_directories('spirv')],
link_with : libmesa_util,
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- build_by_default : false,
+ build_by_default : with_tools.contains('nir'),
+ install : with_tools.contains('nir'),
)
subdir('glsl')