The open source OpenXR runtime
a/os: Refactor out BLE functions into own library
authored by
Jakob Bornecrantz
and committed by
Ryan Pavlik
637c49c1
96eabd13
+18
-14
+16
-12
src/xrt/auxiliary/os/CMakeLists.txt
+16
-12
src/xrt/auxiliary/os/CMakeLists.txt
···
1
1
# Copyright 2019-2022, Collabora, Ltd.
2
2
# SPDX-License-Identifier: BSL-1.0
3
3
4
-
add_library(
5
-
aux_os STATIC
6
-
os_ble.h
7
-
os_documentation.h
8
-
os_hid.h
9
-
os_hid_hidraw.c
10
-
os_threading.h
11
-
)
4
+
####
5
+
# Main os library
6
+
#
7
+
8
+
add_library(aux_os STATIC os_documentation.h os_hid.h os_hid_hidraw.c os_threading.h)
12
9
target_link_libraries(aux_os PUBLIC aux-includes xrt-pthreads)
13
10
11
+
####
12
+
# BLE library
13
+
#
14
+
15
+
add_library(aux_os_ble STATIC os_ble.h)
16
+
target_link_libraries(aux_os_ble PUBLIC aux-includes aux_os)
17
+
14
18
if(XRT_HAVE_DBUS)
15
-
target_sources(aux_os PRIVATE os_ble_dbus.c)
16
-
target_link_libraries(aux_os PRIVATE ${DBUS_LIBRARIES})
17
-
target_include_directories(aux_os SYSTEM PRIVATE ${DBUS_INCLUDE_DIRS})
19
+
target_sources(aux_os_ble PRIVATE os_ble_dbus.c)
20
+
target_link_libraries(aux_os_ble PRIVATE ${DBUS_LIBRARIES})
21
+
target_include_directories(aux_os_ble SYSTEM PRIVATE ${DBUS_INCLUDE_DIRS})
18
22
else()
19
-
target_sources(aux_os PRIVATE os_ble_stubs.c)
23
+
target_sources(aux_os_ble PRIVATE os_ble_stubs.c)
20
24
endif()
+2
-2
src/xrt/drivers/CMakeLists.txt
+2
-2
src/xrt/drivers/CMakeLists.txt
···
13
13
drv_arduino STATIC arduino/arduino_device.c arduino/arduino_interface.h
14
14
arduino/arduino_prober.c
15
15
)
16
-
target_link_libraries(drv_arduino PRIVATE xrt-interfaces aux_util aux_os)
16
+
target_link_libraries(drv_arduino PRIVATE xrt-interfaces aux_util aux_os aux_os_ble)
17
17
list(APPEND ENABLED_DRIVERS arduino)
18
18
endif()
19
19
···
26
26
drv_daydream STATIC daydream/daydream_device.c daydream/daydream_device.h
27
27
daydream/daydream_interface.h daydream/daydream_prober.c
28
28
)
29
-
target_link_libraries(drv_daydream PRIVATE xrt-interfaces aux_util aux_os)
29
+
target_link_libraries(drv_daydream PRIVATE xrt-interfaces aux_util aux_os aux_os_ble)
30
30
list(APPEND ENABLED_DRIVERS daydream)
31
31
endif()
32
32