Commit 5109bbbb authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

update for dynamic-graph-python v4

parent 11b18e8f
......@@ -24,6 +24,7 @@ SET(DOXYGEN_USE_MATHJAX YES)
# JRL-cmakemodule setup
INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/python.cmake)
# Project definition
......@@ -38,8 +39,9 @@ ADD_OPTIONAL_DEPENDENCY("hrp2_14_description >= 1.0.5")
IF(BUILD_PYTHON_INTERFACE)
FINDPYTHON()
SEARCH_FOR_BOOST_PYTHON(REQUIRED)
STRING(REGEX REPLACE "-" "_" PYTHON_DIR ${CUSTOM_HEADER_DIR})
ADD_PROJECT_DEPENDENCY(dynamic-graph-python REQUIRED
ADD_PROJECT_DEPENDENCY(dynamic-graph-python 4.0.0 REQUIRED
PKG_CONFIG_REQUIRES dynamic-graph-python)
ENDIF(BUILD_PYTHON_INTERFACE)
......
Subproject commit 69cc5ff7fff74a2594a633461885412ea98645ea
Subproject commit 9dcde03a880cccc86531019a6845708f5c54c35d
......@@ -71,11 +71,15 @@ FOREACH(plugin ${plugins})
ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
# --- PY ---
IF(BUILD_PYTHON_INTERFACE)
IF(BUILD_PYTHON_INTERFACE
AND NOT plugin STREQUAL "step-checker"
AND NOT plugin STREQUAL "exception-pg"
)
STRING(REPLACE - _ PYTHON_LIBRARY_NAME ${LIBRARY_NAME})
DYNAMIC_GRAPH_PYTHON_MODULE("${PYTHON_DIR}/${PYTHON_LIBRARY_NAME}"
${LIBRARY_NAME} ${PROJECT_NAME}-${PYTHON_LIBRARY_NAME}-wrap)
ENDIF(BUILD_PYTHON_INTERFACE)
${LIBRARY_NAME} ${PROJECT_NAME}-${PYTHON_LIBRARY_NAME}-wrap
MODULE_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/${plugin}-python.hh")
ENDIF()
ENDFOREACH(plugin)
# --- PY ---
......
#include <sot/pattern-generator/next-step-pg-sot.h>
typedef boost::mpl::vector<dynamicgraph::sot::NextStepPgSot> entities_t;
#include <sot/pattern-generator/next-step.h>
typedef boost::mpl::vector<dynamicgraph::sot::NextStep> entities_t;
#include <sot/pattern-generator/pg-manager.h>
typedef boost::mpl::vector<dynamicgraph::sot::PGManager> entities_t;
#include <sot/pattern-generator/pg.h>
typedef boost::mpl::vector<dynamicgraph::sot::PatternGenerator> entities_t;
#include <sot/pattern-generator/selector.h>
typedef boost::mpl::vector<dynamicgraph::sot::Selector> entities_t;
#include <sot/pattern-generator/step-computer-force.h>
typedef boost::mpl::vector<dynamicgraph::sot::StepComputerForce> entities_t;
#include <sot/pattern-generator/step-computer-joystick.h>
typedef boost::mpl::vector<dynamicgraph::sot::StepComputerJoystick> entities_t;
#include <sot/pattern-generator/step-computer-pos.h>
typedef boost::mpl::vector<dynamicgraph::sot::StepComputerPos> entities_t;
#include <sot/pattern-generator/step-observer.h>
typedef boost::mpl::vector<dynamicgraph::sot::StepObserver> entities_t;
#include <sot/pattern-generator/step-queue.h>
typedef boost::mpl::vector<dynamicgraph::sot::StepQueue> entities_t;
#include <sot/pattern-generator/step-time-line.h>
typedef boost::mpl::vector<dynamicgraph::sot::StepTimeLine> entities_t;
#include <sot/pattern-generator/which-foot-upper.h>
typedef boost::mpl::vector<dynamicgraph::sot::WhichFootUpper> entities_t;
/*
* Copyright
*/
#include <iostream>
#include <string>
#include <sstream>
#include <algorithm>
#include <iostream>
#include <iterator>
#include <sstream>
#include <string>
#ifdef BOOST_MPL_LIMIT_VECTOR_SIZE
#pragma push_macro("BOOST_MPL_LIMIT_VECTOR_SIZE")
#undef BOOST_MPL_LIMIT_VECTOR_SIZE
#include <boost/property_tree/ptree.hpp>
#pragma pop_macro("BOOST_MPL_LIMIT_VECTOR_SIZE")
#else
#include <boost/property_tree/ptree.hpp>
#endif
#include <pinocchio/fwd.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/filesystem.hpp>
#include <boost/property_tree/ptree.hpp>
#include <sot/pattern-generator/pg.h>
#include <sot/core/debug.hh>
#include <sot/core/robot-utils.hh>
......
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