Unverified Commit 42d7e759 authored by Rohan Budhiraja's avatar Rohan Budhiraja Committed by GitHub
Browse files

Merge pull request #44 from cmastalli/devel

[upd] Used the latest parametric-curves version
parents 16082260 1a1469dd
......@@ -61,7 +61,7 @@ ADD_REQUIRED_DEPENDENCY("dynamic-graph-python >= 3.0.0")
ADD_REQUIRED_DEPENDENCY("sot-core >= 3.0.0")
ADD_REQUIRED_DEPENDENCY("pinocchio >= 1.2")
ADD_REQUIRED_DEPENDENCY("tsid")
ADD_REQUIRED_DEPENDENCY("parametriccurves")
ADD_REQUIRED_DEPENDENCY("parametric-curves")
SET(SOTTORQUECONTROL_LIB_NAME ${PROJECT_NAME})
SET(LIBRARY_NAME ${SOTTORQUECONTROL_LIB_NAME})
......@@ -130,7 +130,7 @@ PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph-python)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} sot-core)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} pinocchio)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} tsid)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} parametriccurves)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} parametric-curves)
IF(UNIX)
......
......@@ -41,13 +41,13 @@
#include <sot/torque_control/utils/logger.hh>
//#include <sot/torque_control/utils/trajectory-generators.hh>
#include <parametriccurves/spline.hpp>
#include <parametriccurves/constant.hpp>
#include <parametriccurves/text-file.hpp>
#include <parametriccurves/minimum-jerk.hpp>
#include <parametriccurves/linear-chirp.hpp>
#include <parametriccurves/infinite-sinusoid.hpp>
#include <parametriccurves/infinite-const-acc.hpp>
#include <parametric-curves/spline.hpp>
#include <parametric-curves/constant.hpp>
#include <parametric-curves/text-file.hpp>
#include <parametric-curves/minimum-jerk.hpp>
#include <parametric-curves/linear-chirp.hpp>
#include <parametric-curves/infinite-sinusoid.hpp>
#include <parametric-curves/infinite-const-acc.hpp>
#include <map>
#include <initializer_list>
......
......@@ -40,7 +40,7 @@
#include <sot/torque_control/utils/vector-conversions.hh>
#include <sot/torque_control/utils/logger.hh>
#include <sot/torque_control/utils/trajectory-generators.hh>
#include <parametriccurves/spline.hpp>
#include <parametric-curves/spline.hpp>
#include <map>
#include <initializer_list>
#include "boost/assign.hpp"
......
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