The open source OpenXR runtime
a/util: Split out sink functions into own library
authored by
Jakob Bornecrantz
and committed by
Ryan Pavlik
8ca60f43
c9ef44dd
+41
-17
+37
-16
src/xrt/auxiliary/util/CMakeLists.txt
+37
-16
src/xrt/auxiliary/util/CMakeLists.txt
···
1
1
# Copyright 2019-2022, Collabora, Ltd.
2
2
# SPDX-License-Identifier: BSL-1.0
3
3
4
+
####
5
+
# Main util library
6
+
#
7
+
4
8
configure_file(
5
9
"${CMAKE_CURRENT_SOURCE_DIR}/u_git_tag.c.in" "${CMAKE_CURRENT_BINARY_DIR}/u_git_tag.c"
6
10
@ONLY
···
63
67
u_pretty_print.h
64
68
u_prober.c
65
69
u_prober.h
66
-
u_sink.h
67
-
u_sink_combiner.c
68
-
u_sink_force_genlock.c
69
-
u_sink_converter.c
70
-
u_sink_deinterleaver.c
71
-
u_sink_queue.c
72
-
u_sink_simple_queue.c
73
-
u_sink_quirk.c
74
-
u_sink_split.c
75
-
u_sink_stereo_sbs_to_slam_sbs.c
76
70
u_string_list.cpp
77
71
u_string_list.h
78
72
u_string_list.hpp
···
102
96
u_worker.hpp
103
97
"${CMAKE_CURRENT_BINARY_DIR}/u_git_tag.c"
104
98
)
105
-
target_link_libraries(aux_util PUBLIC aux-includes xrt-pthreads aux_generated_bindings aux_math)
106
-
107
-
if(XRT_HAVE_JPEG)
108
-
target_link_libraries(aux_util PRIVATE ${JPEG_LIBRARIES})
109
-
target_include_directories(aux_util PRIVATE ${JPEG_INCLUDE_DIRS})
110
-
endif()
99
+
target_link_libraries(aux_util PUBLIC aux-includes aux_generated_bindings aux_os aux_math)
111
100
112
101
if(XRT_HAVE_SYSTEM_CJSON)
113
102
target_link_libraries(aux_util PUBLIC cJSON::cJSON)
···
130
119
endif()
131
120
132
121
target_include_directories(aux_util PRIVATE ${EIGEN3_INCLUDE_DIR})
122
+
123
+
####
124
+
# Sink library
125
+
#
126
+
127
+
add_library(
128
+
aux_util_sink STATIC
129
+
u_sink.h
130
+
u_sink_combiner.c
131
+
u_sink_force_genlock.c
132
+
u_sink_converter.c
133
+
u_sink_deinterleaver.c
134
+
u_sink_queue.c
135
+
u_sink_simple_queue.c
136
+
u_sink_quirk.c
137
+
u_sink_split.c
138
+
u_sink_stereo_sbs_to_slam_sbs.c
139
+
)
140
+
target_link_libraries(
141
+
aux_util_sink
142
+
PUBLIC
143
+
aux-includes
144
+
xrt-pthreads
145
+
aux_os
146
+
aux_math
147
+
aux_util
148
+
)
149
+
150
+
if(XRT_HAVE_JPEG)
151
+
target_link_libraries(aux_util_sink PRIVATE ${JPEG_LIBRARIES})
152
+
target_include_directories(aux_util_sink PRIVATE ${JPEG_INCLUDE_DIRS})
153
+
endif()
+1
src/xrt/drivers/CMakeLists.txt
+1
src/xrt/drivers/CMakeLists.txt
+1
src/xrt/state_trackers/gui/CMakeLists.txt
+1
src/xrt/state_trackers/gui/CMakeLists.txt
+1
src/xrt/state_trackers/prober/CMakeLists.txt
+1
src/xrt/state_trackers/prober/CMakeLists.txt
+1
-1
src/xrt/targets/common/CMakeLists.txt
+1
-1
src/xrt/targets/common/CMakeLists.txt
···
9
9
target_lists STATIC target_builder_interface.h target_builder_legacy.c target_lists.c
10
10
target_lists.h
11
11
)
12
-
target_link_libraries(target_lists PRIVATE xrt-interfaces aux_util drv_includes)
12
+
target_link_libraries(target_lists PRIVATE xrt-interfaces aux_util aux_util_sink drv_includes)
13
13
target_include_directories(target_lists PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
14
14
15
15
###