Skip to content
Snippets Groups Projects
Commit 93344af1 authored by Justin Carpentier's avatar Justin Carpentier
Browse files

[wip/pinocchio] Correct support for Ubuntu 14.04 and remove previous packaging errors

parent 638bf8a2
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@
# Created: Olivier Stasse on Thu, 4 Feb 2016
#
PKGREVISION= 2
VERSION= 1.1.2
DISTNAME= pinocchio-${VERSION}
......@@ -36,7 +37,6 @@ USE_BOOST_LIBS= python system filesystem unit_test_framework
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../graphics/assimp/depend.mk
include ../../graphics/urdfdom-headers/depend.mk
include ../../graphics/urdfdom/depend.mk
include ../../math/eigen3/depend.mk
include ../../path/hpp-fcl/depend.mk
......@@ -49,18 +49,6 @@ include ../../mk/language/c.mk
include ../../mk/language/c++.mk
DEPEND_ABI.python += python<3
DEPEND_ABI.urdfdom-headers += urdfdom-headers>=0.3
DEPEND_ABI.urdfdom += urdfdom>=0.3
ifeq (Ubuntu,${OPSYS})
ifneq (,$(filter 14.04,${OS_VERSION})) # liburdfdom>=0.3.0 not satisfied on 14.04
PREFER.urdfdom-headers = system
PREFER.urdfdom = system
endif
ifneq (,$(filter 16.04,${OS_VERSION})) # eigen is developmental version on 16.04
PREFER.eigen3 = system
endif
endif
DEPEND_ABI.urdfdom += urdfdom>=0.2.3
include ../../mk/robotpkg.mk
......@@ -5,3 +5,4 @@ SHA1 (patch-aa) = 48bd99335980d76f285645f33d10ab5cd0db0749
SHA1 (patch-ab) = 96f1ea798f0e3fcb2dbef755476a959727550eb0
SHA1 (patch-ac) = 75eb20d87148706b27c1d3601f9a379fbf666bc0
SHA1 (patch-ad) = 55fcdbcd58e5261af4fc94aab05056548f52ccc1
SHA1 (patch-ae) = e690c2574aa22e28d337a3f87aa77ef404540868
Pinocchio can in fact compiled against urdfdom 0.2.3
which is the version of Ubuntu 14.04
--- CMakeLists.txt~ 2016-06-23 11:29:17.251249164 +0200
+++ CMakeLists.txt 2016-06-23 11:29:35.467476187 +0200
@@ -64,7 +64,7 @@
ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5")
ADD_OPTIONAL_DEPENDENCY("eigenpy >= 1.3.0")
#ADD_OPTIONAL_DEPENDENCY("metapod >= 1.0.7")
-ADD_REQUIRED_DEPENDENCY("urdfdom >= 0.2.10")
+ADD_REQUIRED_DEPENDENCY("urdfdom >= 0.2.3")
#ADD_OPTIONAL_DEPENDENCY("lua5.1")
ADD_OPTIONAL_DEPENDENCY("hpp-fcl >= 0.4.1")
IF(HPP_FCL_FOUND AND URDFDOM_FOUND)
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