diff --git a/CMakeLists.txt b/CMakeLists.txt index 2187af7749d04bc00820d597caa26b0ae37860b1..7f3febb3192d99230e42422adee7419b92768f9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/cmake b/cmake index 84f1ae122856a2aaf43b265f4b0689c0296afdc6..a7567987b03fcad59e68aa9c4bf4580af7551144 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 84f1ae122856a2aaf43b265f4b0689c0296afdc6 +Subproject commit a7567987b03fcad59e68aa9c4bf4580af7551144 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e5566f2ee294900112fb12b1e0c216df5302e89b..916154211fa84ed94c71f0c0accc5e942fa7ba87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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}")