[Mesa-dev] [PATCH v2] meson: change vulkan icd config to - instead of _

[Eric Engestrom]

On Saturday, 2017-09-30 01:00:56 +0000, Dylan Baker wrote:
> Just to be consistent.
> 
> v2: - update meson.build too
> 
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>  meson.build       | 2 +-
>  meson_options.txt | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index add27b5dbac..2e1de2b2e20 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -22,7 +22,7 @@ project('mesa', ['c', 'cpp'], version : '17.3.0-devel', license : 'MIT',
>          default_options : ['c_std=c99'])
>  
>  with_dri3 = true  # XXX: need a switch for this
> -with_vulkan_icd_dir = get_option('vulkan_icd_dir')
> +with_vulkan_icd_dir = get_option('vulkan-icd-dir')
>  with_tests = get_option('build-tests')
>  with_valgrind = get_option('valgrind')
>  
> diff --git a/meson_options.txt b/meson_options.txt
> index 082ade7f480..d0f7cc9c7ed 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -22,9 +22,9 @@ option('platforms',      type : 'string',  value : 'x11,wayland',
>         description : 'comma separated list of window systems to support. wayland, x11, surfaceless, drm, etc.')
>  option('vulkan-drivers', type : 'string',  value : 'intel,amd',
>         description : 'comma separated list of vulkan drivers to build.')
> -option('shader-cache',    type : 'boolean', value : true,
> +option('shader-cache',   type : 'boolean', value : true,

Unrelated change (why have more than one space btw?)

Series is:
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

>         description : 'Build with on-disk shader cache support')
> -option('vulkan_icd_dir', type : 'string',  value : '',
> +option('vulkan-icd-dir', type : 'string',  value : '',
>         description : 'Location relative to prefix to put vulkan icds on install. Default: $datadir/vulkan/icd.d')
>  option('valgrind',       type : 'boolean', value : true,
>         description : 'Build with valgrind support if possible')
> -- 
> 2.14.1
>