Mesa (master): meson: Add build option for tools
Scott D Phillips
scott-ph at kemper.freedesktop.org
Thu Feb 8 20:42:21 UTC 2018
Module: Mesa
Branch: master
Commit: 1f4d2433e73a0a6d4e2a180de407970d983309db
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f4d2433e73a0a6d4e2a180de407970d983309db
Author: Scott D Phillips <scott.d.phillips at intel.com>
Date: Wed Feb 7 16:55:24 2018 -0800
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 <eric at anholt.net>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
---
meson.build | 4 ++++
meson_options.txt | 6 ++++++
src/compiler/glsl/meson.build | 6 ++++--
src/compiler/meson.build | 3 ++-
src/gallium/drivers/freedreno/meson.build | 3 ++-
src/gallium/drivers/nouveau/meson.build | 3 ++-
src/intel/tools/meson.build | 6 ++++--
7 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index b61c285bf0..b39e2f8ab9 100644
--- a/meson.build
+++ b/meson.build
@@ -48,6 +48,10 @@ with_libunwind = get_option('libunwind')
with_asm = get_option('asm')
with_osmesa = get_option('osmesa')
with_swr_arches = get_option('swr-arches').split(',')
+with_tools = get_option('tools').split(',')
+if with_tools.contains('all')
+ with_tools = ['freedreno', 'glsl', 'intel', 'nir', 'nouveau']
+endif
if get_option('texture-float')
pre_args += '-DTEXTURE_FLOAT_ENABLED'
message('WARNING: Floating-point texture enabled. Please consult docs/patents.txt and your lawyer before building mesa.')
diff --git a/meson_options.txt b/meson_options.txt
index fca06c4e61..7fafe2deaa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -280,3 +280,9 @@ option(
value : 'avx,avx2',
description : 'Comma delemited swr architectures. choices : avx,avx2,knl,skx'
)
+option(
+ 'tools',
+ type : 'string',
+ value : '',
+ description : 'Comma delimited list of tools to build. choices : freedreno,glsl,intel,nir,nouveau or all'
+)
diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index b0c0de810a..26ab4f1c8d 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 d86bdde61d..e955e66f81 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')
diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build
index ef70cc08c7..f334d2d8ef 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 8ddd865799..e44be2616e 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(
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index 7890eeca1d..82413041b1 100644
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -26,7 +26,8 @@ aubinator = executable(
include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libintel_compiler, libmesa_util],
c_args : [c_vis_args, no_override_init_args],
- build_by_default : false,
+ build_by_default : with_tools.contains('intel'),
+ install : with_tools.contains('intel'),
)
aubinator_error_decode = executable(
@@ -37,5 +38,6 @@ aubinator_error_decode = executable(
include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libintel_compiler, libmesa_util],
c_args : [c_vis_args, no_override_init_args],
- build_by_default : false,
+ build_by_default : with_tools.contains('intel'),
+ install : with_tools.contains('intel'),
)
More information about the mesa-commit
mailing list