Unverified Commit c9fab723 authored by stonneau's avatar stonneau Committed by GitHub
Browse files

Merge pull request #9 from pFernbach/rbprm_v_1

Adapt to changes in hpp-pinocchio
parents c3162ffd b3851402
......@@ -45,11 +45,10 @@ IF (HPP_DEBUG)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHPP_DEBUG")
ENDIF()
ADD_DOC_DEPENDENCY("hpp-core >= 3")
ADD_REQUIRED_DEPENDENCY("hpp-corbaserver >= 3")
ADD_DOC_DEPENDENCY("hpp-core >= 4.2")
ADD_REQUIRED_DEPENDENCY("hpp-corbaserver >= 4.2")
ADD_REQUIRED_DEPENDENCY("hpp-rbprm")
ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4")
ADD_REQUIRED_DEPENDENCY("hpp-model-urdf >= 3")
ADD_REQUIRED_DEPENDENCY("hpp-affordance-corba")
ADD_REQUIRED_DEPENDENCY("hpp-util >= 3")
......
Subproject commit 9965dbcd2a37edbc98707573c05512d838e64c10
Subproject commit 37328d715825baa3bdd7860f8561c68a0a3ff76c
......@@ -84,7 +84,6 @@ ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_cpp)
ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_python)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-rbprm)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-model-urdf)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-corbaserver)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} omniORB4)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-affordance-corba)
......@@ -124,6 +123,6 @@ INSTALL(
# Stand alone corba server
ADD_EXECUTABLE (hpp-rbprm-server hpp-rbprm-corba.cc)
TARGET_LINK_LIBRARIES (hpp-rbprm-server ${LIBRARY_NAME} hpp-rbprm)
PKG_CONFIG_USE_DEPENDENCY(hpp-rbprm-server hpp-model-urdf)
INSTALL (TARGETS hpp-rbprm-server DESTINATION ${CMAKE_INSTALL_BINDIR})
......@@ -62,8 +62,8 @@ namespace hpp {
typedef spline::bezier_curve<> bezier;
namespace impl {
const pinocchio::Device::Computation_t flag = static_cast <pinocchio::Device::Computation_t>
(pinocchio::Device::JOINT_POSITION | pinocchio::Device::JACOBIAN | pinocchio::Device::COM);
const pinocchio::Computation_t flag = static_cast <pinocchio::Computation_t>
(pinocchio::JOINT_POSITION | pinocchio::JACOBIAN | pinocchio::COM);
RbprmBuilder::RbprmBuilder ()
: POA_hpp::corbaserver::rbprm::RbprmBuilder()
......
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