Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
blender
monado
Commits
eec53ca3
Commit
eec53ca3
authored
Apr 08, 2019
by
Ryan Pavlik
Committed by
Jakob Bornecrantz
Apr 08, 2019
Browse files
build: Use FindOpenHMD.
Fixes a gripe/todo in the build system, too :D
parent
78007e46
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
eec53ca3
...
...
@@ -24,10 +24,7 @@ find_package(Eigen3 REQUIRED)
find_package
(
Vulkan REQUIRED
)
find_package
(
OpenGL REQUIRED COMPONENTS GLX
)
find_package
(
HIDAPI
)
# Push into a FindOpenHMD.cmake file.
find_package
(
PkgConfig
)
pkg_check_modules
(
OPENHMD openhmd
)
find_package
(
OpenHMD
)
if
(
CMAKE_SYSTEM_NAME STREQUAL
"Linux"
)
...
...
src/xrt/targets/openxr/CMakeLists.txt
View file @
eec53ca3
...
...
@@ -55,11 +55,6 @@ set(SOURCE_FILES
target.c
)
# Siiiiiiiigh, there is no target_link_directories
# or a way to add directories to a target.
link_directories
(
${
OPENHMD_LIBRARY_DIRS
}
)
# depends on above generated files
add_library
(
${
RUNTIME_TARGET
}
SHARED
${
MANIFEST_DEV_PATH
}
...
...
@@ -73,7 +68,8 @@ add_library(${RUNTIME_TARGET} SHARED
)
target_link_libraries
(
${
RUNTIME_TARGET
}
${
OPENHMD_LIBRARIES
}
PUBLIC
OpenHMD::OpenHMD
${
Vulkan_LIBRARIES
}
${
XCB_LIBRARIES
}
OpenGL::GLX
...
...
@@ -83,7 +79,7 @@ target_compile_definitions(${RUNTIME_TARGET} PRIVATE XRT_HAVE_OHMD)
if
(
TARGET drv_hdk
)
target_sources
(
${
RUNTIME_TARGET
}
PRIVATE $<TARGET_OBJECTS:drv_hdk>
)
target_link_libraries
(
${
RUNTIME_TARGET
}
${
HIDAPI_LIBRARIES
}
)
target_link_libraries
(
${
RUNTIME_TARGET
}
PUBLIC
${
HIDAPI_LIBRARIES
}
)
target_compile_definitions
(
${
RUNTIME_TARGET
}
PRIVATE XRT_HAVE_HDK
)
endif
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment