From c84717bcb6ce03d7cccc030a259fe2fbf7f2b210 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Fri, 11 Sep 2020 14:37:09 +0200 Subject: [PATCH] [CMake] sync submodule and its use --- CMakeLists.txt | 3 +-- cmake | 2 +- python/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a95962d..a20f12a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,9 +26,8 @@ PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) IF(BUILD_PYTHON_INTERFACE) FINDPYTHON() STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME}) + SEARCH_FOR_BOOST_PYTHON(REQUIRED) ADD_PROJECT_DEPENDENCY(eigenpy REQUIRED) - SET(BOOST_COMPONENTS python) - SEARCH_FOR_BOOST() ENDIF(BUILD_PYTHON_INTERFACE) # Project dependencies diff --git a/cmake b/cmake index a61ae61..32015cb 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit a61ae61479a1d50d1ae3c988d1d9aaf20841173d +Subproject commit 32015cb28d977b592227675665d17d11531ef418 diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 3776061..8c8c163 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,6 +1,6 @@ # Define the wrapper library that wraps our library ADD_LIBRARY(${PY_NAME} SHARED centroidal_dynamics_python) -TARGET_LINK_LIBRARIES(${PY_NAME} ${Boost_LIBRARIES} ${PROJECT_NAME} eigenpy::eigenpy) +TARGET_LINK_LIBRARIES(${PY_NAME} ${PROJECT_NAME} eigenpy::eigenpy) # don't prepend wrapper library name with lib SET_TARGET_PROPERTIES(${PY_NAME} PROPERTIES PREFIX "") -- GitLab