Mesa (master): meson: add etnaviv to the tools option

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7ea8e54dd6399b86961a89c35f46d8faccb2a52b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ea8e54dd6399b86961a89c35f46d8faccb2a52b

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Thu Dec 13 21:07:23 2018 +0100

meson: add etnaviv to the tools option

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

---

 meson.build                             | 2 +-
 meson_options.txt                       | 2 +-
 src/gallium/drivers/etnaviv/meson.build | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 57dd8b59cb..86ae13fd60 100644
--- a/meson.build
+++ b/meson.build
@@ -56,7 +56,7 @@ with_osmesa = get_option('osmesa')
 with_swr_arches = get_option('swr-arches')
 with_tools = get_option('tools')
 if with_tools.contains('all')
-  with_tools = ['freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc']
+  with_tools = ['etnaviv', 'freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc']
 endif
 
 dri_drivers_path = get_option('dri-drivers-path')
diff --git a/meson_options.txt b/meson_options.txt
index 589d10bb3f..bfb06c4dd4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -301,7 +301,7 @@ option(
   'tools',
   type : 'array',
   value : [],
-  choices : ['freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'all'],
+  choices : ['etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'all'],
   description : 'List of tools to build. (Note: `intel-ui` selects `intel`)',
 )
 option(
diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build
index 1733024ac9..63553dec51 100644
--- a/src/gallium/drivers/etnaviv/meson.build
+++ b/src/gallium/drivers/etnaviv/meson.build
@@ -101,7 +101,8 @@ etnaviv_compiler = executable(
   include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux],
   link_with : [libmesa_util, libgallium, libetnaviv],
   dependencies : [dep_libdrm_etnaviv],
-  build_by_default : false,
+  build_by_default : with_tools.contains('etnaviv'),
+  install : with_tools.contains('etnaviv'),
 )
 
 driver_etnaviv = declare_dependency(