Skip to content

Commit aef6053

Browse files
committed
Update for dynamic-graph-python v4
1 parent 5b34b4d commit aef6053

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,22 @@ SET(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
1515

1616
# Project configuration
1717
SET(CXX_DISABLE_WERROR True)
18-
SET(CMAKE_CXX_STANDARD 11)
1918
SET(PROJECT_USE_CMAKE_EXPORT TRUE)
2019

2120
# JRL-cmakemodule setup
2221
INCLUDE(cmake/base.cmake)
23-
INCLUDE(cmake/ros.cmake)
22+
INCLUDE(cmake/boost.cmake)
2423
INCLUDE(cmake/python.cmake)
24+
INCLUDE(cmake/ros.cmake)
2525

2626
# Project definition
2727
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
2828
PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
29+
CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE)
2930

3031
# Project dependencies
3132
FINDPYTHON()
33+
SEARCH_FOR_BOOST_PYTHON()
3234
add_required_dependency(bullet)
3335
add_required_dependency(urdfdom)
3436

@@ -48,7 +50,7 @@ SET(CATKIN_REQUIRED_COMPONENTS
4850

4951
find_package(catkin REQUIRED COMPONENTS ${CATKIN_REQUIRED_COMPONENTS})
5052

51-
ADD_PROJECT_DEPENDENCY(dynamic-graph-python REQUIRED)
53+
ADD_PROJECT_DEPENDENCY(dynamic-graph-python 4.0.0 REQUIRED)
5254
ADD_PROJECT_DEPENDENCY(dynamic_graph_bridge REQUIRED)
5355
ADD_PROJECT_DEPENDENCY(sot-core REQUIRED )
5456
ADD_PROJECT_DEPENDENCY(pinocchio REQUIRED)

tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ INSTALL(TARGETS ${DEVICE_NAME} DESTINATION lib)
1717

1818
# build python submodule
1919
STRING(REPLACE - _ PYTHON_LIBRARY_NAME ${DEVICE_NAME})
20-
SET(NEW_ENTITY_CLASS ${ENTITIES})
2120

2221
DYNAMIC_GRAPH_PYTHON_MODULE("sot/test/${PYTHON_LIBRARY_NAME}"
23-
${DEVICE_NAME} sot-test-${PYTHON_LIBRARY_NAME}-wrap)
22+
${DEVICE_NAME} sot-test-${PYTHON_LIBRARY_NAME}-wrap
23+
MODULE_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/${DEVICE_NAME}-python.hh")
2424
SET_TARGET_PROPERTIES(sot-test-${PYTHON_LIBRARY_NAME}-wrap PROPERTIES
2525
LIBRARY_OUTPUT_DIRECTORY ../src) # FIXME: weird catkin / dg interraction
2626

tests/sot-test-device-python.hh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "sot-test-device.hh"
2+
3+
typedef boost::mpl::vector< SoTTestDevice > entities_t;

0 commit comments

Comments
 (0)