From 2fa263b16c0ea69a1313a077b86a988f8e80b73a Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 29 Nov 2019 07:39:37 +0100
Subject: [PATCH] [wip/pyrene-motions] use jrl-cmakemodules
to fix lib64
---
pyrene-motions/Makefile | 9 ++++-----
pyrene-motions/PLIST | 20 ++++++++++++--------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/pyrene-motions/Makefile b/pyrene-motions/Makefile
index 0d2b49ed..b3f4e5bc 100644
--- a/pyrene-motions/Makefile
+++ b/pyrene-motions/Makefile
@@ -1,12 +1,10 @@
# robotpkg Makefile for: wip/pyrene-motions
# Created: Olivier Stasse, on Tue. 21th Aug, 2018
#
-VERSION= 0.0.1
-DISTNAME= pyrene-motions-${VERSION}
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=talos/pyrene-motions/}
-MASTER_REPOSITORY= git git://gepgitlab.laas.fr:pyrene-dev/pyrene-motions.git
-CHECKOUT_VCS_OPTS+= --recursive
+ORG= pyrene-dev
+NAME= pyrene-motions
+VERSION= 0.0.1
CATEGORIES= wip
COMMENT= This packages provides motions of the humanoid robot Pyrene readable by the SoT framework.
@@ -17,6 +15,7 @@ CMAKE_PREFIX_PATH+= ${PREFIX}
WRKSRC= ${WRKDIR}/pyrene-motions-${VERSION}
+include ../../devel/jrl-cmakemodules/Makefile.common
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/language/c.mk
diff --git a/pyrene-motions/PLIST b/pyrene-motions/PLIST
index 4ece1c78..b8a20e83 100644
--- a/pyrene-motions/PLIST
+++ b/pyrene-motions/PLIST
@@ -1,9 +1,13 @@
@comment Tue Aug 21 09:30:06 CEST 2018
-lib/pkgconfig/${PKGNAME}.pc
-share/${PKGNAME}/climb15cmStairsNoHandrail/no_handrail_15cm_1_step.posture
-share/${PKGNAME}/grabHandrail15/handrail_grab.posture
-share/${PKGNAME}/grabHandrail15/stairs_15cm_handrail_grab_actuated.posture
-share/${PKGNAME}/identification/OEM_arms_60s_500Hz.posture
-share/${PKGNAME}/multicontact15/stairs_15cm_multicontact_all_steps_actuated.posture
-share/${PKGNAME}/multicontact15HalfStep/motion_sequence.posture
-share/${PKGNAME}/multicontact15SingleStep/stairs_15cm_with_handrail_first_full_step.posture
+include/pyrene/motions/config.hh
+include/pyrene/motions/deprecated.hh
+include/pyrene/motions/warning.hh
+lib/pkgconfig/pyrene-motions.pc
+share/pyrene-motions/climb15cmStairsNoHandrail/no_handrail_15cm_1_step.posture
+share/pyrene-motions/grabHandrail15/handrail_grab.posture
+share/pyrene-motions/grabHandrail15/stairs_15cm_handrail_grab_actuated.posture
+share/pyrene-motions/identification/OEM_arms_60s_500Hz.csv
+share/pyrene-motions/identification/OEM_arms_60s_500Hz.posture
+share/pyrene-motions/multicontact15/stairs_15cm_multicontact_all_steps_actuated.posture
+share/pyrene-motions/multicontact15HalfStep/motion_sequence.posture
+share/pyrene-motions/multicontact15SingleStep/stairs_15cm_with_handrail_first_full_step.posture
--
GitLab