From 1f4d2433e73a0a6d4e2a180de407970d983309db Mon Sep 17 00:00:00 2001 From: Scott D Phillips Date: Wed, 7 Feb 2018 16:55:24 -0800 Subject: 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 Reviewed-by: Jordan Justen Reviewed-by: Eric Engestrom Reviewed-by: Dylan Baker --- src/gallium/drivers/freedreno/meson.build | 3 ++- src/gallium/drivers/nouveau/meson.build | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build index ef70cc08c74..f334d2d8ef8 100644 --- a/src/gallium/drivers/freedreno/meson.build +++ b/src/gallium/drivers/freedreno/meson.build @@ -249,5 +249,6 @@ ir3_compiler = executable( libglsl_standalone, libmesa_util, ], - build_by_default : true, + build_by_default : with_tools.contains('freedreno'), + install : with_tools.contains('freedreno'), ) diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build index 8ddd8657991..e44be2616e7 100644 --- a/src/gallium/drivers/nouveau/meson.build +++ b/src/gallium/drivers/nouveau/meson.build @@ -219,7 +219,8 @@ nouveau_compiler = executable( include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux], dependencies : [dep_libdrm, dep_libdrm_nouveau], link_with : [libnouveau, libgallium, libmesa_util], - build_by_default : false, + build_by_default : with_tools.contains('nouveau'), + install : with_tools.contains('nouveau'), ) driver_nouveau = declare_dependency( -- cgit v1.2.3