The open source OpenXR runtime
build: Fix linking issues preventing the OpenXR runtime from working.
+21
-6
+9
-3
src/xrt/compositor/CMakeLists.txt
+9
-3
src/xrt/compositor/CMakeLists.txt
···
55
55
client/comp_gl_xlib_client.h
56
56
client/comp_gl_xlib_glue.c
57
57
)
58
-
59
58
endif()
60
59
if(BUILD_WITH_OPENGL AND BUILD_WITH_EGL)
61
60
list(APPEND CLIENT_SOURCE_FILES
···
64
63
endif()
65
64
66
65
add_library(comp_client STATIC ${CLIENT_SOURCE_FILES})
67
-
target_link_libraries(comp_client PUBLIC xrt-interfaces PRIVATE aux_util)
66
+
target_link_libraries(comp_client PUBLIC xrt-interfaces PRIVATE aux_util aux_vk)
68
67
target_include_directories(comp_client PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
69
68
69
+
if(BUILD_WITH_OPENGL)
70
+
target_link_libraries(comp_client PRIVATE aux_ogl)
71
+
endif()
72
+
73
+
if(BUILD_WITH_OPENGL AND BUILD_WITH_XLIB)
74
+
target_link_libraries(comp_client PRIVATE OpenGL::GLX)
75
+
endif()
70
76
##
71
77
# Main library
72
78
#
···
113
119
endif()
114
120
115
121
add_library(comp_main STATIC ${SHADER_HEADERS} ${MAIN_SOURCE_FILES} ${WL_PROTOS_SRC})
116
-
target_link_libraries(comp_main PUBLIC xrt-interfaces PRIVATE aux_util aux_os)
122
+
target_link_libraries(comp_main PUBLIC xrt-interfaces PRIVATE aux_util aux_os aux_vk)
117
123
target_include_directories(comp_main PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
118
124
target_include_directories(comp_main SYSTEM PRIVATE
119
125
# Shaders - marked SYSTEM so we get no warnings
+1
-1
src/xrt/state_trackers/oxr/CMakeLists.txt
+1
-1
src/xrt/state_trackers/oxr/CMakeLists.txt
+11
-2
src/xrt/targets/openxr/CMakeLists.txt
+11
-2
src/xrt/targets/openxr/CMakeLists.txt
···
24
24
${SOURCE_FILES}
25
25
)
26
26
27
+
# Note: Order matters in this list!
27
28
target_link_libraries(${RUNTIME_TARGET} PUBLIC
28
29
aux_vk
29
30
aux_os
30
31
aux_ogl
31
32
aux_util
32
33
aux_math
33
-
comp_main
34
-
comp_client
35
34
st_oxr
36
35
st_gui
37
36
st_prober
37
+
comp_main
38
+
comp_client
38
39
target_lists
39
40
)
40
41
41
42
if(BUILD_WITH_SDL2)
42
43
target_link_libraries(${RUNTIME_TARGET} PUBLIC imgui_impl_sdl)
44
+
endif()
45
+
46
+
if(NOT MSVC)
47
+
# Force the main "negotiate" symbol's inclusion
48
+
set_property(TARGET ${RUNTIME_TARGET}
49
+
APPEND_STRING
50
+
PROPERTY LINK_FLAGS
51
+
"-u xrNegotiateLoaderRuntimeInterface")
43
52
endif()
44
53
45
54