From 746cccca36cfe93b1216a3360801c918f8e6e250 Mon Sep 17 00:00:00 2001
From: Christoph Haag <christoph.haag@collabora.com>
Date: Thu, 31 Oct 2019 02:26:19 +0100
Subject: [PATCH] meson: HDK driver does not depend on hidapi
---
meson.build | 7 ++-----
src/xrt/drivers/meson.build | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 0546b2836..2d8a5158b 100644
--- a/meson.build
+++ b/meson.build
@@ -89,7 +89,7 @@ drivers = get_option('drivers')
if 'ohmd' in drivers
openhmd_required = true
endif
-if 'hdk' in drivers or 'psvr' in drivers
+if 'psvr' in drivers
hidapi_required = true
endif
if 'v4l2' in drivers
@@ -97,7 +97,7 @@ if 'v4l2' in drivers
endif
if 'auto' in drivers
- drivers += ['psmv', 'hydra']
+ drivers += ['psmv', 'hydra', 'hdk']
endif
openhmd = dependency('openhmd', required: openhmd_required)
@@ -114,9 +114,6 @@ if hidapi.found() and ('auto' in drivers or 'psvr' in drivers or 'hdk' in driver
if 'psvr' not in drivers
drivers += ['psvr']
endif
- if 'hdk' not in drivers
- drivers += ['hdk']
- endif
endif
if zlib.found() and ('auto' in drivers or 'vive' in drivers)
diff --git a/src/xrt/drivers/meson.build b/src/xrt/drivers/meson.build
index 4aa7df18a..48837846e 100644
--- a/src/xrt/drivers/meson.build
+++ b/src/xrt/drivers/meson.build
@@ -12,7 +12,7 @@ lib_drv_hdk = static_library(
'hdk/hdk_prober.c',
),
include_directories: xrt_include,
- dependencies: [aux, hidapi],
+ dependencies: [aux],
build_by_default: 'hdk' in drivers,
)
--
GitLab