File tree Expand file tree Collapse file tree 2 files changed +5
-11
lines changed Expand file tree Collapse file tree 2 files changed +5
-11
lines changed Original file line number Diff line number Diff line change @@ -40,8 +40,6 @@ SET(CMAKE_VERBOSE_MAKEFILE TRUE)
4040
4141# JRL-cmakemodule setup
4242INCLUDE (cmake/base.cmake)
43- INCLUDE (cmake/boost.cmake)
44- INCLUDE (cmake/python.cmake)
4543INCLUDE (cmake/ide.cmake)
4644INCLUDE (cmake/apple .cmake)
4745
@@ -72,6 +70,11 @@ ENDIF(EIGEN_NO_AUTOMATIC_RESIZING)
7270CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE)
7371
7472# Project dependencies
73+ IF (BUILD_PYTHON_INTERFACE)
74+ SET (PYWRAP ${PROJECT_NAME} _pywrap)
75+ ADD_PROJECT_DEPENDENCY(eigenpy 2.7.12 REQUIRED)
76+ ENDIF (BUILD_PYTHON_INTERFACE)
77+
7578ADD_PROJECT_DEPENDENCY(pinocchio 2.3.1 REQUIRED)
7679ADD_PROJECT_DEPENDENCY(eiquadprog 1.1.3 REQUIRED)
7780
@@ -84,14 +87,6 @@ IF(BUILD_TESTING)
8487 FIND_PACKAGE (Boost REQUIRED COMPONENTS unit_test_framework)
8588ENDIF (BUILD_TESTING)
8689
87- IF (BUILD_PYTHON_INTERFACE)
88- set (PYTHON_COMPONENTS Interpreter Development.Module NumPy)
89- FINDPYTHON()
90- SET (PYWRAP ${PROJECT_NAME} _pywrap)
91- ADD_PROJECT_DEPENDENCY(eigenpy REQUIRED)
92- SEARCH_FOR_BOOST_PYTHON(REQUIRED)
93- ENDIF (BUILD_PYTHON_INTERFACE)
94-
9590# Main Library
9691SET (${PROJECT_NAME} _MATH_HEADERS
9792 include /tsid/math/fwd.hpp
Original file line number Diff line number Diff line change @@ -29,7 +29,6 @@ FILE(GLOB ${PYWRAP}_SOURCES
2929
3030ADD_LIBRARY (${PYWRAP} SHARED ${${PYWRAP} _SOURCES} ${${PYWRAP} _HEADERS})
3131TARGET_LINK_LIBRARIES (${PYWRAP} PUBLIC ${PROJECT_NAME} eigenpy::eigenpy)
32- TARGET_LINK_BOOST_PYTHON(${PYWRAP} PRIVATE )
3332
3433IF (BUILD_WITH_COMMIT_VERSION)
3534 TAG_LIBRARY_VERSION(${PYWRAP} )
You can’t perform that action at this time.
0 commit comments