From: Christian Gmeiner Date: Thu, 13 Dec 2018 20:07:23 +0000 (+0100) Subject: meson: add etnaviv to the tools option X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7ea8e54dd6399b86961a89c35f46d8faccb2a52b;p=mesa.git meson: add etnaviv to the tools option Signed-off-by: Christian Gmeiner Reviewed-by: Dylan Baker --- diff --git a/meson.build b/meson.build index 57dd8b59cb4..86ae13fd60f 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 589d10bb3f3..bfb06c4dd42 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 1733024ac98..63553dec510 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(