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

Update for dynamic-graph-python v4

parent 5b34b4d4
......@@ -15,20 +15,22 @@ SET(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
# Project configuration
SET(CXX_DISABLE_WERROR True)
SET(CMAKE_CXX_STANDARD 11)
SET(PROJECT_USE_CMAKE_EXPORT TRUE)
# JRL-cmakemodule setup
INCLUDE(cmake/base.cmake)
INCLUDE(cmake/ros.cmake)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/python.cmake)
INCLUDE(cmake/ros.cmake)
# Project definition
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE)
# Project dependencies
FINDPYTHON()
SEARCH_FOR_BOOST_PYTHON()
add_required_dependency(bullet)
add_required_dependency(urdfdom)
......@@ -48,7 +50,7 @@ SET(CATKIN_REQUIRED_COMPONENTS
find_package(catkin REQUIRED COMPONENTS ${CATKIN_REQUIRED_COMPONENTS})
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(sot-core REQUIRED )
ADD_PROJECT_DEPENDENCY(pinocchio REQUIRED)
......
Subproject commit 72cf8cdefcf8cde818745ad7998122bde0b54734
Subproject commit 9dcde03a880cccc86531019a6845708f5c54c35d
......@@ -17,10 +17,10 @@ INSTALL(TARGETS ${DEVICE_NAME} DESTINATION lib)
# build python submodule
STRING(REPLACE - _ PYTHON_LIBRARY_NAME ${DEVICE_NAME})
SET(NEW_ENTITY_CLASS ${ENTITIES})
DYNAMIC_GRAPH_PYTHON_MODULE("sot/test/${PYTHON_LIBRARY_NAME}"
${DEVICE_NAME} sot-test-${PYTHON_LIBRARY_NAME}-wrap)
${DEVICE_NAME} sot-test-${PYTHON_LIBRARY_NAME}-wrap
MODULE_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/${DEVICE_NAME}-python.hh")
SET_TARGET_PROPERTIES(sot-test-${PYTHON_LIBRARY_NAME}-wrap PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ../src) # FIXME: weird catkin / dg interraction
......
#include "sot-test-device.hh"
typedef boost::mpl::vector< SoTTestDevice > entities_t;
Markdown is supported
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