Skip to content
Snippets Groups Projects
Commit ca7130b0 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/{py-,}sot-core-v3] add patch-aa

To fix compatibility with recent pinocchio versions
While here, switch to jrl-cmakemodules
parent b20bb76a
No related branches found
No related tags found
No related merge requests found
......@@ -5,14 +5,10 @@
ORG= stack-of-tasks
NAME= sot-core
VERSION= 4.5.0
PKGREVISION= 1
DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}
CHECKOUT_VCS_OPTS+= --recursive
CATEGORIES= wip
COMMENT= Hierarchical task based control of humanoid robots (python bindings)
LICENSE= 2-clause-bsd
......@@ -20,11 +16,11 @@ MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= py[0-9][0-9]-${NAME}
CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
CMAKE_ARGS+= -DINSTALL_PYTHON_INTERFACE_ONLY=ON
CMAKE_ARGS+= -DPYTHON_PACKAGES_DIR="site-packages"
include ../../wip/jrl-cmakemodules/Makefile.common
include ../../${CATEGORIES}/${NAME}-v3/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
......
SHA1 (sot-core-4.5.0.tar.gz) = 16ede3f2fb97bffa3fbc84ca592abee48e9bd9c1
RMD160 (sot-core-4.5.0.tar.gz) = 7ec0e92eee0ab50dac2af2a0d40f2f4afce8c79c
Size (sot-core-4.5.0.tar.gz) = 1107245 bytes
SHA1 (patch-aa) = d0f79fa4777967d2d114a1f83ae3c9406e572f43
From 8a36be8624dd19753d115edcdb8a7e77d464a5c4 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 13 Sep 2019 13:50:57 +0200
Subject: [PATCH] include pinocchio before boost
ref https://github.com/stack-of-tasks/pinocchio/issues/849
---
include/sot/core/device.hh | 2 ++
include/sot/core/robot-simu.hh | 2 ++
2 files changed, 4 insertions(+)
diff --git a/include/sot/core/device.hh b/include/sot/core/device.hh
index f81de5ed..fe1e6693 100644
--- include/sot/core/device.hh
+++ include/sot/core/device.hh
@@ -13,6 +13,8 @@
/* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */
+#include <pinocchio/fwd.hpp>
+
/* -- MaaL --- */
#include <dynamic-graph/linear-algebra.h>
namespace dg = dynamicgraph;
diff --git a/include/sot/core/robot-simu.hh b/include/sot/core/robot-simu.hh
index 60a8b56c..2c3da3e7 100644
--- include/sot/core/robot-simu.hh
+++ include/sot/core/robot-simu.hh
@@ -13,6 +13,8 @@
/* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */
+#include <pinocchio/fwd.hpp>
+
/* -- MaaL --- */
#include <dynamic-graph/linear-algebra.h>
namespace dg = dynamicgraph;
--
2.17.1
......@@ -5,14 +5,10 @@
ORG= stack-of-tasks
NAME= sot-core
VERSION= 4.5.0
PKGREVISION= 1
DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${NAME}-v3-${VERSION}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
CATEGORIES= wip
COMMENT= Hierarchical task based control of humanoid robots
LICENSE= 2-clause-bsd
......@@ -21,10 +17,8 @@ MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= ${NAME}
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
include ../../wip/jrl-cmakemodules/Makefile.common
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../math/eigen3/depend.mk
......
SHA1 (sot-core-4.5.0.tar.gz) = 16ede3f2fb97bffa3fbc84ca592abee48e9bd9c1
RMD160 (sot-core-4.5.0.tar.gz) = 7ec0e92eee0ab50dac2af2a0d40f2f4afce8c79c
Size (sot-core-4.5.0.tar.gz) = 1107245 bytes
SHA1 (patch-aa) = d0f79fa4777967d2d114a1f83ae3c9406e572f43
From 8a36be8624dd19753d115edcdb8a7e77d464a5c4 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 13 Sep 2019 13:50:57 +0200
Subject: [PATCH] include pinocchio before boost
ref https://github.com/stack-of-tasks/pinocchio/issues/849
---
include/sot/core/device.hh | 2 ++
include/sot/core/robot-simu.hh | 2 ++
2 files changed, 4 insertions(+)
diff --git a/include/sot/core/device.hh b/include/sot/core/device.hh
index f81de5ed..fe1e6693 100644
--- include/sot/core/device.hh
+++ include/sot/core/device.hh
@@ -13,6 +13,8 @@
/* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */
+#include <pinocchio/fwd.hpp>
+
/* -- MaaL --- */
#include <dynamic-graph/linear-algebra.h>
namespace dg = dynamicgraph;
diff --git a/include/sot/core/robot-simu.hh b/include/sot/core/robot-simu.hh
index 60a8b56c..2c3da3e7 100644
--- include/sot/core/robot-simu.hh
+++ include/sot/core/robot-simu.hh
@@ -13,6 +13,8 @@
/* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */
+#include <pinocchio/fwd.hpp>
+
/* -- MaaL --- */
#include <dynamic-graph/linear-algebra.h>
namespace dg = dynamicgraph;
--
2.17.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment