Skip to content

Commit

Permalink
Merge openrave-yarp-plugins-27 into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jgvictores committed Jan 8, 2018
2 parents 185dfa9 + 4b9892e commit 7fde99b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ list(APPEND CMAKE_MODULE_PATH ${TEO_CONFIGURATION_FILES_MODULE_PATH})

# add main contents
add_subdirectory(share)
add_subdirectory(scripts)

# export our variables to a TEOConfig.cmake creation
set(TEO_CONFIGURATION_FILES_LINK_DIRS ${TEO_CONFIGURATION_FILES_LINK_DIRS} ${LIBRARY_OUTPUT_PATH})
Expand Down
12 changes: 12 additions & 0 deletions scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Copyright: UC3M 2017
# Author: roboticslab, jgvictores, etc
# CopyPolicy: Released under the terms of the GNU GPL v2.0.
#

find_package(YARP REQUIRED)
list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
include(YarpInstallationHelpers)
#yarp_configure_external_installation(teo-configuration-files) # Commentig out because not using generated vars

yarp_install(PROGRAMS bash/teoSim DESTINATION ${CMAKE_INSTALL_BINDIR})

2 changes: 2 additions & 0 deletions scripts/bash/teoSim
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
openrave /usr/local/share/teo-openrave-models/contexts/openrave/teo/teo.robot.xml --module OpenraveYarpPluginLoader "open --device controlboardwrapper2 --subdevice YarpOpenraveControlboard --robotIndex 0 --allManipulators"

0 comments on commit 7fde99b

Please sign in to comment.