From 6dd9098cd7ed3ea49df8a0eb44e7aa02dd2d6f46 Mon Sep 17 00:00:00 2001 From: nyorain Date: Thu, 27 Jul 2017 12:05:08 +0200 Subject: Fix vulkan windows; Make test succeed w/o driver Fix an error in the windows vulkan_sdk library finding. Also don't fail the vulkan test only because no vulkan driver is installed (should fix the travis error). --- mesonbuild/dependencies/ui.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mesonbuild/dependencies/ui.py') diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index c182e84..7e077c7 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -538,10 +538,13 @@ class VulkanDependency(ExternalDependency): inc_path = os.path.join(self.vulkan_sdk, inc_dir) header = os.path.join(inc_path, 'vulkan', 'vulkan.h') lib_path = os.path.join(self.vulkan_sdk, lib_dir) - find_lib = self.compiler.find_library('vulkan', environment, lib_path) + find_lib = self.compiler.find_library(lib_name, environment, lib_path) - if not (find_lib and os.path.isfile(header)): - raise DependencyException('VULKAN_SDK point to invalid directory') + if not find_lib: + raise DependencyException('VULKAN_SDK point to invalid directory (no lib)') + + if not os.path.isfile(header): + raise DependencyException('VULKAN_SDK point to invalid directory (no include)') self.type_name = 'vulkan_sdk' self.is_found = True -- cgit v1.1