From 08c26d595fc955c05aefaa45669e7b5cd3c94584 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 3 Mar 2023 19:39:53 +0000 Subject: [PATCH] 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 --- meson.build | 4 ++-- src/meson.build | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index a1e14ebd..5ed2d80f 100644 --- a/meson.build +++ b/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') diff --git a/src/meson.build b/src/meson.build index 6849ecbe..d3d692ec 100644 --- a/src/meson.build +++ b/src/meson.build @@ -281,6 +281,7 @@ if get_option('mangoapp_layer') pre_args, ], dependencies : [ + dep_vulkan, json_dep ], gnu_symbol_visibility : 'hidden',