meson: change vulkan icd config to - instead of _

Just to be consistent.

v2: - update meson.build too
v3: - remove unrelated whitespace change

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

diff --git a/meson.build b/meson.build
index 329495ee1b31937fc00b2eeb44b91e51ddec9dbf..1e0b95fcb160e20d4b6952e226a5b959974137cb 100644 (file)
--- 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 082ade7f4807fa0a189f67a20caad476ce9ecc62..eccd5c10d59074fee2643bd5fa546dd99baf318c 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -24,7 +24,7 @@ option('vulkan-drivers', type : 'string',  value : 'intel,amd',
        description : 'comma separated list of vulkan drivers to build.')
 option('shader-cache',    type : 'boolean', value : true,
        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')