diff options
| author | nyorain <nyorain@gmail.com> | 2017-07-27 12:05:08 +0200 |
|---|---|---|
| committer | nyorain <nyorain@gmail.com> | 2017-07-27 12:05:08 +0200 |
| commit | 6dd9098cd7ed3ea49df8a0eb44e7aa02dd2d6f46 (patch) | |
| tree | 76ce3ea129cf7c2b99b0ed6546d88d65d2920072 /mesonbuild/dependencies/ui.py | |
| parent | 02e5c58efcea5efef9fc26bdce1dd4629ea96d68 (diff) | |
| download | meson-6dd9098cd7ed3ea49df8a0eb44e7aa02dd2d6f46.zip meson-6dd9098cd7ed3ea49df8a0eb44e7aa02dd2d6f46.tar.gz meson-6dd9098cd7ed3ea49df8a0eb44e7aa02dd2d6f46.tar.bz2 | |
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).
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 9 |
1 files changed, 6 insertions, 3 deletions
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 |