Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

If ROBOTOLOGY_USES_OCULUS_SDK is enabled compile yarp-device-ovrheadset #518

Merged
merged 1 commit into from
Nov 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ if(ROBOTOLOGY_ENABLE_R1_ROBOT)
find_or_build_package(cer)
endif()

if(ROBOTOLOGY_USES_OCULUS_SDK)
find_or_build_package(yarp-device-ovrheadset)
endif()

if(ROBOTOLOGY_USES_MATLAB)
# The following line is to properly configure the matlab and simulink software installed by the superbuild
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/template/startup_robotology_superbuild.m.in ${CMAKE_BINARY_DIR}/startup_robotology_superbuild.m)
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -661,8 +661,7 @@ To configure the Oculus SDK follow the steps for Oculus SDK mentioned [here](htt
## Cyberith
Support for this dependency is enabled by the `ROBOTOLOGY_USES_CYBERITH_SDK` CMake option.

**Warning: at the moment the Oculus SDK does not support macOS and Linux, so this option is only supported
on Windows.**
**Warning: at the moment the Cyberith SDK does not support macOS and Linux, so this option is only supported on Windows.**

### System Dependencies
To check and install the Cyberith SDK, please follow the steps for Cyberith SDK mentioned in [here](https://github.com/robotology/walking-teleoperation/blob/master/docs/Dependencies.md).
Expand Down
2 changes: 0 additions & 2 deletions cmake/Buildwalking-teleoperation.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ ycm_ep_helper(walking-teleoperation TYPE GIT
TAG master
COMPONENT teleoperation
FOLDER robotology
# CMAKE_ARGS -DWALKING_TELEOPERATION_USES_CYBSDK:BOOL=${ROBOTOLOGY_USES_CYBERITH_SDK}
# -DWALKING_TELEOPERATION_USES_OCULUSSDK:BOOL=${ROBOTOLOGY_USES_OCULUS_SDK}
DEPENDS iDynTree
ICUB
YARP)
16 changes: 16 additions & 0 deletions cmake/Buildyarp-device-ovrheadset.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Copyright (C) 2020 Fondazione Istituto Italiano di Tecnologia
# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT

include(YCMEPHelper)
include(FindOrBuildPackage)

find_or_build_package(YCM QUIET)
find_or_build_package(YARP QUIET)

ycm_ep_helper(yarp-device-ovrheadset TYPE GIT
STYLE GITHUB
REPOSITORY robotology/yarp-device-ovrheadset.git
TAG master
COMPONENT iCub
FOLDER robotology
DEPENDS YARP)