From 0b108f9a3dd4f575fe5f94025c1542df1ac1c76f Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Thu, 18 Aug 2022 11:36:32 +0200 Subject: [PATCH] CMake: update for eigenpy 2.7.11 --- CMakeLists.txt | 6 ++---- cmake | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65b8496..10b18df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,6 @@ SET(PROJECT_COMPATIBILITY_VERSION AnyNewerVersion) # JRL-cmakemodule setup INCLUDE(cmake/base.cmake) -INCLUDE(cmake/python.cmake) # Print initial message MESSAGE(STATUS "${PROJECT_DESCRIPTION}, version ${PROJECT_VERSION}") @@ -32,9 +31,8 @@ COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) IF(BUILD_PYTHON_INTERFACE) - set(PYTHON_COMPONENTS Interpreter Development.Module NumPy) - FINDPYTHON() - ADD_PROJECT_DEPENDENCY(pinocchio) + ADD_PROJECT_DEPENDENCY(eigenpy 2.7.11 REQUIRED) + ADD_PROJECT_DEPENDENCY(pinocchio REQUIRED) STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME}) ADD_SUBDIRECTORY(python) IF(BUILD_TESTING) diff --git a/cmake b/cmake index 6491546..f4e4be6 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6491546e5a27363f759cfd2f7bb522dcaa03b5c3 +Subproject commit f4e4be6a6f6577d86c9e2b09ae3a9bf1a545437e -- GitLab