From 512af89251bbcab33bc90b94f9cd557199b6eabf Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Mon, 16 Sep 2019 11:36:13 +0200 Subject: [PATCH] [wip/jrl-cmakemodules] add USE_PYTHON & USE_MASTER_GITHUB options --- jrl-cmakemodules/Makefile.common | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/jrl-cmakemodules/Makefile.common b/jrl-cmakemodules/Makefile.common index 887163fd..f414a6fb 100644 --- a/jrl-cmakemodules/Makefile.common +++ b/jrl-cmakemodules/Makefile.common @@ -13,14 +13,30 @@ ifndef VERSION endif DISTNAME?= ${NAME}-${VERSION} +ifdef USE_PYTHON + PKGNAME?= ${PKGTAG.python-}${DISTNAME} +endif MASTER_SITES?= ${MASTER_SITE_OPENROBOTS:=${NAME}/} MASTER_REPOSITORY?= ${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}.git CHECKOUT_VCS_OPTS+= --recursive +ifdef USE_MASTER_GITHUB + MASTER_SITES?= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}}/releases/download/v${VERSION}/ +else + MASTER_SITES?= ${MASTER_SITE_OPENROBOTS:=${NAME}/} +endif + CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON +ifdef USE_PYTHON + CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON} + CMAKE_ARGS+= -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE} + CMAKE_ARGS+= -DPYTHON_LIBRARY=${PYTHON_LIB} + CMAKE_ARGS+= -DPYTHON_SITELIB=${PYTHON_SITELIB} +endif + DYNAMIC_PLIST_DIRS+= share/doc/${NAME} include ../../pkgtools/pkg-config/depend.mk -- GitLab