diff --git a/CMakeLists.txt b/CMakeLists.txt index b1f4a6123..b04da45b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/src/xrt/targets/openxr/CMakeLists.txt b/src/xrt/targets/openxr/CMakeLists.txt index 63dca95f7..c78c84a6d 100644 --- a/src/xrt/targets/openxr/CMakeLists.txt +++ b/src/xrt/targets/openxr/CMakeLists.txt @@ -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()