[wip/{ → py-}casadi] update compilation options

Makefile

@@ -7,7 +7,6 @@ SUBDIR+=	antlr2
 SUBDIR+=	aruco-ros
 SUBDIR+=	backward-ros
 SUBDIR+=	can-utils
-SUBDIR+=	casadi
 SUBDIR+=	certi
 SUBDIR+=	cppad
 SUBDIR+=	cppadcodegen
@@ -84,6 +83,7 @@ SUBDIR+=	prf-ros-control
 SUBDIR+=	prf-ros-controllers
 SUBDIR+=	prf-teleop-tools
 SUBDIR+=	py-bmtools
+SUBDIR+=	py-casadi
 SUBDIR+=	py-crocoddyl
 SUBDIR+=	py-curves
 SUBDIR+=	py-dynamic-graph-bridge-v3

casadi/Makefile → py-casadi/Makefile

-# robotpkg Makefile for:	wip/casadi
+# robotpkg Makefile for:	wip/py-casadi
 # Created:			Guilhem Saurel on Wed, 7 Aug 2019
 #
 
@@ -7,6 +7,7 @@ NAME=			casadi
 VERSION=		3.4.5
 
 DISTNAME=		${NAME}-${VERSION}
+PKGNAME=		${PKGTAG.python-}${DISTNAME}
 
 HOMEPAGE=		${MASTER_SITE_GITHUB:=${ORG}/${NAME}}
 MASTER_SITES=		${HOMEPAGE}/archive/${VERSION}/
@@ -18,7 +19,23 @@ COMMENT=		Build efficient optimal control software, with minimal effort.
 LICENSE=		gnu-lgpl-v3
 MAINTAINER=		gsaurel@laas.fr
 
+CMAKE_ARGS+=		-DPYTHON_PREFIX=${PREFIX}/${PYTHON_SITELIB}
+CMAKE_ARGS+=		-DWITH_IPOPT=ON
+CMAKE_ARGS+=		-DWITH_LAPACK=ON
+CMAKE_ARGS+=		-DWITH_OPENMP=ON
+CMAKE_ARGS+=		-DWITH_PYTHON=ON
+CMAKE_ARGS+=		-DWITH_PYTHON3=$(if $(filter 3,${PYTHON_MAJOR}),ON,OFF)
+CMAKE_ARGS+=		-DWITH_QPOASES=ON
+CMAKE_ARGS+=		-DWITH_THREAD=ON
+
+#include ../../wip/mk/sysdep/sundials.mk
+include ../../devel/swig/depend.mk
+include ../../math/lapack/depend.mk
+include ../../optimization/ipopt/depend.mk
+include ../../optimization/qpoases/depend.mk
 include ../../mk/sysdep/cmake.mk
+include ../../mk/sysdep/python.mk
+include ../../mk/sysdep/tinyxml2.mk
 include ../../mk/language/c.mk
 include ../../mk/language/c++.mk
 include ../../mk/robotpkg.mk

casadi/PLIST → py-casadi/PLIST

-@comment Wed Aug 7 18:56:18 CEST 2019
+@comment Wed Aug 7 20:50:09 CEST 2019
 include/casadi/casadi.hpp
+include/casadi/casadi.i
+include/casadi/casadi_numpy.hpp
 include/casadi/config.h
 include/casadi/core/calculus.hpp
 include/casadi/core/callback.hpp
@@ -92,7 +94,11 @@ include/casadi/core/timing.hpp
 include/casadi/core/variable.hpp
 include/casadi/core/xml_file.hpp
 include/casadi/core/xml_node.hpp
+include/casadi/doc.i
+include/casadi/doc_merged.i
 include/casadi/mem.h
+include/casadi/valgrind-casadi.supp
+include/casadi/valgrind-python.supp
 lib/cmake/casadi/casadi-config-version.cmake
 lib/cmake/casadi/casadi-config.cmake
 lib/cmake/casadi/casadi-targets-release.cmake
@@ -101,6 +107,8 @@ lib/libcasadi.so
 lib/libcasadi.so.3.5
 lib/libcasadi_conic_nlpsol.so
 lib/libcasadi_conic_nlpsol.so.3.5
+lib/libcasadi_conic_qpoases.so
+lib/libcasadi_conic_qpoases.so.3.5
 lib/libcasadi_conic_qrqp.so
 lib/libcasadi_conic_qrqp.so.3.5
 lib/libcasadi_importer_shell.so
@@ -121,6 +129,10 @@ lib/libcasadi_linsol_csparse.so
 lib/libcasadi_linsol_csparse.so.3.5
 lib/libcasadi_linsol_csparsecholesky.so
 lib/libcasadi_linsol_csparsecholesky.so.3.5
+lib/libcasadi_linsol_lapacklu.so
+lib/libcasadi_linsol_lapacklu.so.3.5
+lib/libcasadi_linsol_lapackqr.so
+lib/libcasadi_linsol_lapackqr.so.3.5
 lib/libcasadi_linsol_ldl.so
 lib/libcasadi_linsol_ldl.so.3.5
 lib/libcasadi_linsol_lsqr.so
@@ -129,6 +141,8 @@ lib/libcasadi_linsol_qr.so
 lib/libcasadi_linsol_qr.so.3.5
 lib/libcasadi_linsol_symbolicqr.so
 lib/libcasadi_linsol_symbolicqr.so.3.5
+lib/libcasadi_nlpsol_ipopt.so
+lib/libcasadi_nlpsol_ipopt.so.3.5
 lib/libcasadi_nlpsol_scpgen.so
 lib/libcasadi_nlpsol_scpgen.so.3.5
 lib/libcasadi_nlpsol_sqpmethod.so
@@ -145,3 +159,13 @@ lib/libcasadi_sundials_common.so
 lib/libcasadi_sundials_common.so.3.5
 lib/libcasadi_xmlfile_tinyxml.so
 lib/libcasadi_xmlfile_tinyxml.so.3.5
+${PYTHON_SITELIB}/casadi/__init__.py
+${PYTHON_SITELIB}/casadi/_casadi.so
+${PYTHON_SITELIB}/casadi/casadi.py
+${PYTHON_SITELIB}/casadi/tools/__init__.py
+${PYTHON_SITELIB}/casadi/tools/bounds.py
+${PYTHON_SITELIB}/casadi/tools/graph/__init__.py
+${PYTHON_SITELIB}/casadi/tools/graph/graph.py
+${PYTHON_SITELIB}/casadi/tools/in_out.py
+${PYTHON_SITELIB}/casadi/tools/structure.py
+${PYTHON_SITELIB}/casadi/tools/structure3.py

casadi/depend.mk → py-casadi/depend.mk

-# robotpkg depend.mk for:	wip/casadi
+# robotpkg depend.mk for:	wip/py-casadi
 # Created:			Guilhem Saurel on Tue, 17 Oct 2018
 #
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-CASADI_DEPEND_MK:=	${CASADI_DEPEND_MK}+
+PY_CASADI_DEPEND_MK:=	${PY_CASADI_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		casadi
+DEPEND_PKG+=		py-casadi
 endif
 
-ifeq (+,$(CASADI_DEPEND_MK)) # ------------------------------------------
+ifeq (+,$(PY_CASADI_DEPEND_MK)) # ------------------------------------------
 
 PREFER.casadi?=		robotpkg
 
-SYSTEM_SEARCH.casadi=\
+SYSTEM_SEARCH.py-casadi=\
   'include/casadi/config.hpp:/CASADI_VERSION_STRING/s/[^0-9.]//gp'	\
   'lib/libcasadi.so'
 
-DEPEND_USE+=		casadi
+DEPEND_USE+=		py-casadi
 
-DEPEND_ABI.casadi?=	casadi>=3.4.5
-DEPEND_DIR.casadi?=	../../wip/casadi
+DEPEND_ABI.py-casadi?=	${PKGTAG.python-}casadi>=3.4.5
+DEPEND_DIR.py-casadi?=	../../wip/py-casadi
 
-endif # CASADI_DEPEND_MK ------------------------------------------------
+include ../../mk/sysdep/python.mk
+
+endif # PY_CASADI_DEPEND_MK ------------------------------------------------
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}