File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -35,18 +35,19 @@ PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
35
35
# Project dependencies
36
36
SET (CATKIN_REQUIRED_COMPONENTS roscpp std_msgs message_generation std_srvs geometry_msgs sensor_msgs tf2_ros
37
37
realtime_tools )
38
+ FIND_PACKAGE (Boost REQUIRED COMPONENTS program_options )
38
39
39
40
IF (BUILD_PYTHON_INTERFACE )
40
41
FINDPYTHON ()
42
+ SEARCH_FOR_BOOST_PYTHON ()
41
43
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
43
45
PKG_CONFIG_REQUIRES dynamic-graph-python )
44
46
SET (CATKIN_REQUIRED_COMPONENTS ${CATKIN_REQUIRED_COMPONENTS} rospy )
45
47
ENDIF (BUILD_PYTHON_INTERFACE )
46
48
47
49
find_package (catkin REQUIRED COMPONENTS ${CATKIN_REQUIRED_COMPONENTS} )
48
50
49
- SEARCH_FOR_BOOST ()
50
51
51
52
ADD_PROJECT_DEPENDENCY (sot-core REQUIRED PKG_CONFIG_REQUIRES sot-core )
52
53
Original file line number Diff line number Diff line change @@ -50,13 +50,13 @@ ENDIF(BUILD_PYTHON_INTERFACE)
50
50
51
51
# Stand alone embedded intepreter with a robot controller.
52
52
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 )
54
54
pkg_config_use_dependency (geometric_simu dynamic_graph_bridge_msgs )
55
55
install (TARGETS geometric_simu
56
56
DESTINATION lib/${PROJECT_NAME} )
57
57
58
58
# Sot loader library
59
59
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 )
61
61
pkg_config_use_dependency (sot_loader dynamic_graph_bridge_msgs )
62
62
install (TARGETS sot_loader EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib )
You can’t perform that action at this time.
0 commit comments