Skip to content

Commit 9390116

Browse files
committed
update for dynamic-graph-python v4
1 parent 413541e commit 9390116

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,19 @@ PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
3535
# Project dependencies
3636
SET(CATKIN_REQUIRED_COMPONENTS roscpp std_msgs message_generation std_srvs geometry_msgs sensor_msgs tf2_ros
3737
realtime_tools)
38+
FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options)
3839

3940
IF(BUILD_PYTHON_INTERFACE)
4041
FINDPYTHON()
42+
SEARCH_FOR_BOOST_PYTHON()
4143
STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
42-
ADD_PROJECT_DEPENDENCY(dynamic-graph-python REQUIRED
44+
ADD_PROJECT_DEPENDENCY(dynamic-graph-python 4.0.0 REQUIRED
4345
PKG_CONFIG_REQUIRES dynamic-graph-python)
4446
SET(CATKIN_REQUIRED_COMPONENTS ${CATKIN_REQUIRED_COMPONENTS} rospy)
4547
ENDIF(BUILD_PYTHON_INTERFACE)
4648

4749
find_package(catkin REQUIRED COMPONENTS ${CATKIN_REQUIRED_COMPONENTS})
4850

49-
SEARCH_FOR_BOOST()
5051

5152
ADD_PROJECT_DEPENDENCY(sot-core REQUIRED PKG_CONFIG_REQUIRES sot-core)
5253

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ ENDIF(BUILD_PYTHON_INTERFACE)
5050

5151
# Stand alone embedded intepreter with a robot controller.
5252
add_executable(geometric_simu geometric_simu.cpp sot_loader.cpp sot_loader_basic.cpp)
53-
target_link_libraries(geometric_simu ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${catkin_LIBRARIES} ros_bridge)
53+
target_link_libraries(geometric_simu Boost::program_options ${CMAKE_DL_LIBS} ${catkin_LIBRARIES} ros_bridge)
5454
pkg_config_use_dependency(geometric_simu dynamic_graph_bridge_msgs)
5555
install(TARGETS geometric_simu
5656
DESTINATION lib/${PROJECT_NAME})
5757

5858
# Sot loader library
5959
add_library(sot_loader sot_loader.cpp sot_loader_basic.cpp)
60-
target_link_libraries(sot_loader ${Boost_LIBRARIES} ${catkin_LIBRARIES} ros_bridge)
60+
target_link_libraries(sot_loader Boost::program_options ${catkin_LIBRARIES} ros_bridge)
6161
pkg_config_use_dependency(sot_loader dynamic_graph_bridge_msgs)
6262
install(TARGETS sot_loader EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)

0 commit comments

Comments
 (0)