Skip to content
Snippets Groups Projects
Commit cdd22252 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

CMake: update to dynamic-graph-python 4.0.6

parent 98bec86a
No related branches found
No related tags found
No related merge requests found
......@@ -26,7 +26,6 @@ SET(DOXYGEN_USE_TEMPLATE_CSS YES)
# JRL-cmakemodule setup
INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/python.cmake)
INCLUDE(cmake/sphinx.cmake)
# Project definition
......@@ -36,7 +35,7 @@ CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE)
# Project dependencies
ADD_PROJECT_DEPENDENCY(dynamic-graph REQUIRED)
ADD_PROJECT_DEPENDENCY(dynamic-graph-python 4.0.0 REQUIRED)
ADD_PROJECT_DEPENDENCY(dynamic-graph-python 4.0.6 REQUIRED)
ADD_PROJECT_DEPENDENCY(pinocchio REQUIRED)
ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS regex program_options)
IF(BUILD_TESTING)
......@@ -51,10 +50,8 @@ IF(Boost_VERSION GREATER 107299 OR Boost_VERSION_MACRO GREATER 107299)
ENDIF()
IF(BUILD_PYTHON_INTERFACE)
FINDPYTHON()
STRING(REGEX REPLACE "-" "_" PYTHON_DIR ${CUSTOM_HEADER_DIR})
ADD_PROJECT_DEPENDENCY(eigenpy REQUIRED)
SEARCH_FOR_BOOST_PYTHON(REQUIRED)
ENDIF(BUILD_PYTHON_INTERFACE)
# Verbosity level
......
Subproject commit 84f1ae122856a2aaf43b265f4b0689c0296afdc6
Subproject commit a7567987b03fcad59e68aa9c4bf4580af7551144
......@@ -166,9 +166,7 @@ IF(BUILD_PYTHON_INTERFACE)
# Robot_utils_sot_py PYTHON module *
# **********************************
ADD_LIBRARY(robot_utils_sot_py SHARED tools/robot-utils-py.cpp)
TARGET_INCLUDE_DIRECTORIES(robot_utils_sot_py SYSTEM PUBLIC ${PYTHON_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(robot_utils_sot_py PUBLIC
${PYTHON_LIBRARIES} ${PROJECT_NAME})
TARGET_LINK_LIBRARIES(robot_utils_sot_py PUBLIC ${PROJECT_NAME})
TARGET_LINK_BOOST_PYTHON(robot_utils_sot_py PRIVATE)
SET_TARGET_PROPERTIES(robot_utils_sot_py PROPERTIES PREFIX "")
INSTALL(TARGETS robot_utils_sot_py DESTINATION "${PYTHON_SITELIB}/dynamic_graph/${PYTHON_DIR}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment