From 2b82140de04b4c36c021fe82c629649b88922be2 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Fri, 30 Aug 2019 23:30:28 +0200 Subject: [PATCH] [wip/py-crocoddyl] fix python sitelib --- py-crocoddyl/Makefile | 3 ++- py-crocoddyl/distinfo | 1 - py-crocoddyl/patches/patch-aa | 27 --------------------------- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 py-crocoddyl/patches/patch-aa diff --git a/py-crocoddyl/Makefile b/py-crocoddyl/Makefile index 238ac584..d68dc973 100644 --- a/py-crocoddyl/Makefile +++ b/py-crocoddyl/Makefile @@ -5,7 +5,7 @@ ORG= loco-3d NAME= crocoddyl VERSION= 0.9.0 -PKGREVISION= 1 +PKGREVISION= 2 DISTNAME= ${NAME}-${VERSION} PKGNAME= ${PKGTAG.python-}${DISTNAME} @@ -22,6 +22,7 @@ MAINTAINER= gepetto-soft@laas.fr CONFLICTS+= py[0-9][0-9]-crocoddyl CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib +CMAKE_ARGS+= -DPYTHON_PACKAGES_DIR=site-packages DYNAMIC_PLIST_DIRS+= share/doc/${NAME} diff --git a/py-crocoddyl/distinfo b/py-crocoddyl/distinfo index fd7a345b..b114b653 100644 --- a/py-crocoddyl/distinfo +++ b/py-crocoddyl/distinfo @@ -1,4 +1,3 @@ SHA1 (crocoddyl-0.9.0.tar.gz) = 07709cdd8b984c80ea8ba89192242071aa3f72f9 RMD160 (crocoddyl-0.9.0.tar.gz) = dcd3982f7e07d52208d3cf398c1532a326c0391d Size (crocoddyl-0.9.0.tar.gz) = 2129419 bytes -SHA1 (patch-aa) = 949bd23d0f834a59ca51232aa769fd52991c1965 diff --git a/py-crocoddyl/patches/patch-aa b/py-crocoddyl/patches/patch-aa deleted file mode 100644 index c208d3b2..00000000 --- a/py-crocoddyl/patches/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ ---- bindings/python/crocoddyl/CMakeLists.txt.orig 2019-08-30 22:43:50.324843483 +0200 -+++ bindings/python/crocoddyl/CMakeLists.txt 2019-08-30 22:44:29.598973409 +0200 -@@ -6,7 +6,6 @@ - __init__.py - ) - -- - ADD_LIBRARY(${PROJECT_NAME}_pywrap SHARED ${${PROJECT_NAME}_PYTHON_BINDINGS_SOURCES}) - PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME}_pywrap eigen3) - PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME}_pywrap eigenpy) -@@ -17,15 +16,11 @@ - - INSTALL(TARGETS ${PROJECT_NAME}_pywrap DESTINATION ${PYTHON_SITELIB}/${PROJECT_NAME}) - -- - FOREACH(python ${${PROJECT_NAME}_PYTHON_BINDINGS_FILES}) - PYTHON_BUILD(. ${python}) -- INSTALL(FILES -- "${${PROJECT_NAME}_SOURCE_DIR}/bindings/python/crocoddyl/${python}" -- DESTINATION ${PYTHON_SITELIB}/${PROJECT_NAME}) -+ INSTALL(FILES ${python} DESTINATION ${PYTHON_SITELIB}/${PROJECT_NAME}) - ENDFOREACH(python ${${PROJECT_NAME}_PYTHON_BINDINGS_FILES}) - -- - SET(${PROJECT_NAME}_BINDINGS_UTILS_PYTHON_FILES - __init__.py - biped.py -- GitLab