diff --git a/Makefile b/Makefile
index 4fa8bba2a437296eabbe7f364bea8bfc5fcdccab..0258607e306fe5127d8b644e48f2be936058ef29 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ SUBDIR+=	libhatp
 SUBDIR+=	libnabo
 SUBDIR+=	libpointmatcher
 SUBDIR+=	morse-ros
+SUBDIR+=	mpi-cmake-modules
 SUBDIR+=	msgconnector
 SUBDIR+=	multicontact-api
 SUBDIR+=	octovis
diff --git a/mpi-cmake-modules/DESCR b/mpi-cmake-modules/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..78572d1c393cc61a9354430f473ba4a64300af35
--- /dev/null
+++ b/mpi-cmake-modules/DESCR
@@ -0,0 +1 @@
+This package mpi_cmake_modules defines a list of usefull cmake macros. It can be used by simply depending on it using ament
diff --git a/mpi-cmake-modules/Makefile b/mpi-cmake-modules/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..da1dd83e21e4de6e8c21add1e4b50a7e859493f1
--- /dev/null
+++ b/mpi-cmake-modules/Makefile
@@ -0,0 +1,30 @@
+# robotpkg Makefile for:	wip/py39-mpi-cmake-modules
+# Created:			Guilhem Saurel on Tue, 2 Mar 2021
+#
+
+ORG=			machines-in-motion
+NAME=			mpi-cmake-modules
+VERSION=		1.0.0
+
+DIST_SUBDIR=		${NAME}
+DISTNAME=		v${VERSION}
+PKGNAME=		${PKGTAG.python-}${NAME}-${VERSION}
+
+ROSNAME=		$(subst -,_,${NAME})
+WRKSRC=			${WRKDIR}/${ROSNAME}-${VERSION}
+
+MASTER_SITES?=		${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}/archive/
+MASTER_REPOSITORY?=	${MASTER_REPOSITORY_GITHUB}${ORG}/${ROSNAME}.git
+
+CATEGORIES=		wip
+COMMENT=		list of usefull cmake macros
+LICENSE=		modified-bsd
+MAINTAINER=		gsaurel@laas.fr
+
+
+include ../../wip/py-breathe/depend.mk
+include ../../mk/sysdep/python.mk
+include ../../mk/sysdep/cmake.mk
+include ../../mk/language/c.mk
+include ../../mk/language/c++.mk
+include ../../mk/robotpkg.mk
diff --git a/mpi-cmake-modules/PLIST b/mpi-cmake-modules/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..22df1ea399144cdd5d86f4534b51b22ef153fe88
--- /dev/null
+++ b/mpi-cmake-modules/PLIST
@@ -0,0 +1,49 @@
+@comment Tue Mar 2 12:34:33 CET 2021
+bin/mpi_cmake_format
+bin/mpi_code_format
+bin/mpi_cpp_format
+bin/mpi_python_format
+${PYTHON_SITELIB}/mpi_cmake_modules/__init__.py
+${PYTHON_SITELIB}/mpi_cmake_modules/_clang-format
+${PYTHON_SITELIB}/mpi_cmake_modules/cmake_format.py
+${PYTHON_SITELIB}/mpi_cmake_modules/cpp_format.py
+${PYTHON_SITELIB}/mpi_cmake_modules/python_format.py
+${PYTHON_SITELIB}/mpi_cmake_modules/utils.py
+${PYTHON_SITELIB}/mpi_cmake_modules/yaml2oneline.py
+share/mpi_cmake_modules/cmake/documentation.cmake
+share/mpi_cmake_modules/cmake/doxygen.cmake
+share/mpi_cmake_modules/cmake/dynamic_graph.cmake
+share/mpi_cmake_modules/cmake/find_modules.cmake
+share/mpi_cmake_modules/cmake/find_modules/FindPythonModules.cmake
+share/mpi_cmake_modules/cmake/find_modules/Findcereal.cmake
+share/mpi_cmake_modules/cmake/find_modules/Findrt.cmake
+share/mpi_cmake_modules/cmake/find_modules/XenomaiConfig.cmake
+share/mpi_cmake_modules/cmake/find_modules/python/FindPython.cmake
+share/mpi_cmake_modules/cmake/find_modules/python/FindPython.cmake.backup
+share/mpi_cmake_modules/cmake/find_modules/python/Support.cmake
+share/mpi_cmake_modules/cmake/generate_cmake_package.cmake
+share/mpi_cmake_modules/cmake/get_python_install_dir.cmake
+share/mpi_cmake_modules/cmake/get_python_interpreter.cmake
+share/mpi_cmake_modules/cmake/global_calls.cmake
+share/mpi_cmake_modules/cmake/install_scripts.cmake
+share/mpi_cmake_modules/cmake/mpi_cmake_modulesConfig.cmake
+share/mpi_cmake_modules/cmake/mpi_cmake_modulesConfigVersion.cmake
+share/mpi_cmake_modules/cmake/os_detection.cmake
+share/mpi_cmake_modules/cmake/print_target_properties.cmake
+share/mpi_cmake_modules/cmake/pybind11.cmake
+share/mpi_cmake_modules/cmake/sphinx.cmake
+share/mpi_cmake_modules/cmake/xacro.cmake
+share/mpi_cmake_modules/cmake/xenomai.cmake
+share/mpi_cmake_modules/resources/Doxyfile.in
+share/mpi_cmake_modules/resources/__init__.py.empty.in
+share/mpi_cmake_modules/resources/_clang-format
+share/mpi_cmake_modules/resources/dg_python_module.cc.in
+share/mpi_cmake_modules/resources/py_filter
+share/mpi_cmake_modules/resources/sphinx/doxygen/Doxyfile.in
+share/mpi_cmake_modules/resources/sphinx/sphinx/cmake_doc.rst.in
+share/mpi_cmake_modules/resources/sphinx/sphinx/conf.py
+share/mpi_cmake_modules/resources/sphinx/sphinx/conf.py.in
+share/mpi_cmake_modules/resources/sphinx/sphinx/doxygen_index.rst.in
+share/mpi_cmake_modules/resources/sphinx/sphinx/doxygen_index_one_page.rst.in
+share/mpi_cmake_modules/resources/sphinx/sphinx/general_documentation.rst.in
+share/mpi_cmake_modules/resources/sphinx/sphinx/index.rst.in
diff --git a/mpi-cmake-modules/depend.mk b/mpi-cmake-modules/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..269d3c82f01622727d6808f377ceae7b834fd80f
--- /dev/null
+++ b/mpi-cmake-modules/depend.mk
@@ -0,0 +1,29 @@
+# robotpkg depend.mk for:	wip/py39-mpi-cmake-modules
+# Created:			Guilhem Saurel on Tue, 2 Mar 2021
+#
+
+DEPEND_DEPTH:=			${DEPEND_DEPTH}+
+MPI_CMAKE_MODULES_DEPEND_MK:=	${MPI_CMAKE_MODULES_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=			mpi-cmake-modules
+endif
+
+ifeq (+,$(MPI_CMAKE_MODULES_DEPEND_MK)) # ------------------------------------------
+
+PREFER.mpi-cmake-modules?=		robotpkg
+
+SYSTEM_SEARCH.mpi-cmake-modules=									\
+  'include/example/adder/config.hh:/MPI_CMAKE_MODULES_VERSION /s/[^0-9.]//gp'			\
+  'lib/cmake/mpi-cmake-modules/mpi-cmake-modulesConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp'	\
+  'lib/libmpi-cmake-modules.so'									\
+  'lib/pkgconfig/mpi-cmake-modules.pc:/Version/s/[^0-9.]//gp'
+
+DEPEND_USE+=			mpi-cmake-modules
+
+DEPEND_ABI.mpi-cmake-modules?=	mpi-cmake-modules>=1.0.0
+DEPEND_DIR.mpi-cmake-modules?=	../../wip/mpi-cmake-modules
+
+endif # MPI_CMAKE_MODULES_DEPEND_MK ------------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/mpi-cmake-modules/distinfo b/mpi-cmake-modules/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..700f767eba5cbca3a71939f2fe748f5979d49512
--- /dev/null
+++ b/mpi-cmake-modules/distinfo
@@ -0,0 +1,3 @@
+SHA1 (mpi-cmake-modules/v1.0.0.tar.gz) = fcda46801107f42e0b7e77e99b8cd89f6cfc185a
+RMD160 (mpi-cmake-modules/v1.0.0.tar.gz) = 515643c3e549de6bebdeef77086f529d5eeab7c4
+Size (mpi-cmake-modules/v1.0.0.tar.gz) = 41478 bytes