aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/ui.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-12-04 18:54:47 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2019-12-05 00:22:10 +0200
commite4a0ee205d23a3d3af9dab9685ec330a41e553d5 (patch)
treee05291994cae465b456b74757685aabecf65c951 /mesonbuild/dependencies/ui.py
parentef19e1ff2d6b0f791a3b4c4fcfdf5e284cd448cc (diff)
downloadmeson-e4a0ee205d23a3d3af9dab9685ec330a41e553d5.zip
meson-e4a0ee205d23a3d3af9dab9685ec330a41e553d5.tar.gz
meson-e4a0ee205d23a3d3af9dab9685ec330a41e553d5.tar.bz2
lgtm: Fix redundant code
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
-rw-r--r--mesonbuild/dependencies/ui.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
index 638bc68..bdcc4a7 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -605,16 +605,14 @@ class VulkanDependency(ExternalDependency):
# TODO: this config might not work on some platforms, fix bugs as reported
# we should at least detect other 64-bit platforms (e.g. armv8)
lib_name = 'vulkan'
+ lib_dir = 'lib'
+ inc_dir = 'include'
if mesonlib.is_windows():
lib_name = 'vulkan-1'
lib_dir = 'Lib32'
inc_dir = 'Include'
if detect_cpu_family(self.env.coredata.compilers.host) == 'x86_64':
lib_dir = 'Lib'
- else:
- lib_name = 'vulkan'
- lib_dir = 'lib'
- inc_dir = 'include'
# make sure header and lib are valid
inc_path = os.path.join(self.vulkan_sdk, inc_dir)