meson: do not pick system vulkan, when explicitly disabled

For this to actually work, we also need to set dep_vulkan for all users.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

meson.build

@@ -111,7 +111,6 @@ inc_common = [
     include_directories('include'),
 ]
 
-dep_vulkan = dependency('vulkan', required: get_option('use_system_vulkan'))
 dep_pthread = dependency('threads')
 
 add_project_arguments(
@@ -164,7 +163,8 @@ else
   dep_rt = null_dep
 endif
 
-if dep_vulkan.found()
+dep_vulkan = dependency('vulkan', required: get_option('use_system_vulkan'))
+if dep_vulkan.found() and not get_option('use_system_vulkan').disabled()
   datadir = get_option('vulkan_datadir')
   if datadir == ''
     datadir = get_option('datadir')

src/meson.build

@@ -281,6 +281,7 @@ if get_option('mangoapp_layer')
       pre_args,
       ],
     dependencies : [
+      dep_vulkan,
       json_dep
     ],
     gnu_symbol_visibility : 'hidden',