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

[wip/{py-,}example-adder] use jrl-cmakemodules

parent 172bab1b
No related branches found
No related tags found
No related merge requests found
......@@ -4,13 +4,7 @@
ORG= gepetto
NAME= example-adder
VERSION= 2.0.0
DISTNAME= ${NAME}-${VERSION}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= git https://gepgitlab.laas.fr/${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
VERSION= 2.0.1
CATEGORIES= wip
COMMENT= Example Project
......@@ -18,10 +12,8 @@ LICENSE= 2-clause-bsd
MAINTAINER= gsaurel@laas.fr
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
include ../../wip/jrl/Makefile.common
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../pkgtools/pkg-config/depend.mk
......
SHA1 (example-adder-2.0.0.tar.gz) = d6662f8b49aa28af9f1b6c0dbbfe7b5d66883c24
RMD160 (example-adder-2.0.0.tar.gz) = d9f5f30acf314a5478ba07edfd0e8718fd04b571
Size (example-adder-2.0.0.tar.gz) = 771666 bytes
SHA1 (example-adder-2.0.1.tar.gz) = 0a7edde30710906c0d29c18c931ec0cca07b35d6
RMD160 (example-adder-2.0.1.tar.gz) = b59fcee2835ea54ced2d75941f4159c00076b052
Size (example-adder-2.0.1.tar.gz) = 771833 bytes
......@@ -4,15 +4,10 @@
ORG= gepetto
NAME= example-adder
VERSION= 2.0.0
VERSION= 2.0.1
DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${DISTNAME}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= git https://gepgitlab.laas.fr/${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
CMAKE_ARGS+= -DINSTALL_PYTHON_INTERFACE_ONLY=ON
CATEGORIES= wip
......@@ -20,6 +15,7 @@ COMMENT= Example Project
LICENSE= 2-clause-bsd
MAINTAINER= gsaurel@laas.fr
include ../../wip/jrl/Makefile.common
include ../../wip/${NAME}/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
......
SHA1 (example-adder-2.0.0.tar.gz) = d6662f8b49aa28af9f1b6c0dbbfe7b5d66883c24
RMD160 (example-adder-2.0.0.tar.gz) = d9f5f30acf314a5478ba07edfd0e8718fd04b571
Size (example-adder-2.0.0.tar.gz) = 771666 bytes
SHA1 (patch-aa) = ed6dc24b8dbe6064193963ba585b3e86023cd985
SHA1 (example-adder-2.0.1.tar.gz) = 0a7edde30710906c0d29c18c931ec0cca07b35d6
RMD160 (example-adder-2.0.1.tar.gz) = b59fcee2835ea54ced2d75941f4159c00076b052
Size (example-adder-2.0.1.tar.gz) = 771833 bytes
revert https://github.com/jrl-umi3218/jrl-cmakemodules/pull/214
to comply with robotpkg PYTHON_SITELIB instead of Debian / Ubuntu
--- cmake/python.cmake.orig 2019-07-28 11:15:53.000000000 +0200
+++ cmake/python.cmake 2019-08-31 18:28:52.847614739 +0200
@@ -84,7 +84,7 @@
EXECUTE_PROCESS(
COMMAND "${PYTHON_EXECUTABLE}" "-c"
- "from distutils import sysconfig; print(sysconfig.get_python_lib(prefix='', plat_specific=False))"
+ "import sys, os; print(os.sep.join(['lib', 'python' + sys.version[:3], 'site-packages']))"
OUTPUT_VARIABLE PYTHON_SITELIB
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
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