Commit e7a8ca41 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

Update for dynamic-graph-python v4

parent 6679978a
......@@ -28,21 +28,20 @@ COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX C)
PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
# Project dependencies
SET(BOOST_COMPONENTS filesystem system thread program_options
unit_test_framework python)
FINDPYTHON()
SEARCH_FOR_BOOST_PYTHON()
SET(CATKIN_REQUIRED_COMPONENTS roscpp std_msgs)
SET(CATKIN_DEPENDS_LIBRARIES ros_bridge sot_loader)
ADD_PROJECT_DEPENDENCY(sot-dynamic-pinocchio REQUIRED)
ADD_PROJECT_DEPENDENCY(dynamic-graph-python REQUIRED)
ADD_PROJECT_DEPENDENCY(dynamic-graph-python 4.0.0 REQUIRED)
ADD_PROJECT_DEPENDENCY(dynamic_graph_bridge REQUIRED)
ADD_PROJECT_DEPENDENCY(roscpp REQUIRED)
ADD_PROJECT_DEPENDENCY(talos_data REQUIRED)
ADD_PROJECT_DEPENDENCY(pyrene-motions REQUIRED)
ADD_REQUIRED_DEPENDENCY(dynamic_graph_bridge_msgs)
FINDPYTHON()
SEARCH_FOR_BOOST()
FIND_PACKAGE(catkin REQUIRED COMPONENTS ${CATKIN_REQUIRED_COMPONENTS})
ADD_SUBDIRECTORY(src)
......
Subproject commit fb4c22c319ec5320f9a85527eb1a4130954846f5
Subproject commit 9dcde03a880cccc86531019a6845708f5c54c35d
......@@ -27,9 +27,9 @@ INSTALL(TARGETS ${DEVICE_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)
# build python submodule
STRING(REPLACE - _ PYTHON_LIBRARY_NAME ${DEVICE_NAME})
SET(NEW_ENTITY_CLASS ${ENTITIES})
DYNAMIC_GRAPH_PYTHON_MODULE("sot/talos/${PYTHON_LIBRARY_NAME}"
${DEVICE_NAME} sot-talos-${PYTHON_LIBRARY_NAME}-wrap)
${DEVICE_NAME} sot-talos-${PYTHON_LIBRARY_NAME}-wrap
MODULE_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/${DEVICE_NAME}-python.hh")
# Add the library to wrap the controller of Pyrene.
SET(CONTROLLER_NAME sot-pyrene-controller)
......
#include "sot-talos-device.hh"
typedef boost::mpl::vector< SoTTalosDevice > entities_t;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment