Skip to content

Commit c00b6e7

Browse files
Link ros_bridge with bridge_msgs by using libarary interface.
1 parent 194d35d commit c00b6e7

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ ADD_LIBRARY(ros_bridge SHARED
7777
TARGET_INCLUDE_DIRECTORIES(ros_bridge SYSTEM PUBLIC ${catkin_INCLUDE_DIRS})
7878
TARGET_INCLUDE_DIRECTORIES(ros_bridge PUBLIC $<INSTALL_INTERFACE:include>)
7979
TARGET_LINK_LIBRARIES(ros_bridge ${catkin_LIBRARIES}
80-
sot-core::sot-core pinocchio::pinocchio)
80+
sot-core::sot-core pinocchio::pinocchio dynamic_graph_bridge_msgs::dynamic_graph_bridge_msgs)
8181

8282
IF(SUFFIX_SO_VERSION)
8383
SET_TARGET_PROPERTIES(ros_bridge PROPERTIES SOVERSION ${PROJECT_VERSION})

src/CMakeLists.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ FOREACH(plugin ${plugins})
1414
SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
1515
ENDIF(SUFFIX_SO_VERSION)
1616

17-
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_deps} ${catkin_LIBRARIES} ros_bridge
18-
dynamic_graph_bridge_msgs::dynamic_graph_bridge_msgs)
17+
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_deps} ${catkin_LIBRARIES} ros_bridge)
1918

2019
IF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
2120
INSTALL(TARGETS ${LIBRARY_NAME} EXPORT ${TARGETS_EXPORT_NAME}
@@ -46,8 +45,7 @@ IF(BUILD_PYTHON_INTERFACE)
4645
# ros_interperter library.
4746
add_library(ros_interpreter ros_interpreter.cpp)
4847
TARGET_LINK_LIBRARIES(ros_interpreter ros_bridge ${catkin_LIBRARIES}
49-
dynamic-graph-python::dynamic-graph-python
50-
dynamic_graph_bridge_msgs::dynamic_graph_bridge_msgs)
48+
dynamic-graph-python::dynamic-graph-python)
5149

5250
install(TARGETS ros_interpreter
5351
EXPORT ${TARGETS_EXPORT_NAME}
@@ -56,13 +54,11 @@ ENDIF(BUILD_PYTHON_INTERFACE)
5654

5755
# Stand alone embedded intepreter with a robot controller.
5856
add_executable(geometric_simu geometric_simu.cpp sot_loader.cpp sot_loader_basic.cpp)
59-
target_link_libraries(geometric_simu Boost::program_options ${CMAKE_DL_LIBS} ${catkin_LIBRARIES} ros_bridge
60-
dynamic_graph_bridge_msgs::dynamic_graph_bridge_msgs)
57+
target_link_libraries(geometric_simu Boost::program_options ${CMAKE_DL_LIBS} ${catkin_LIBRARIES} ros_bridge)
6158
install(TARGETS geometric_simu
6259
DESTINATION lib/${PROJECT_NAME})
6360

6461
# Sot loader library
6562
add_library(sot_loader sot_loader.cpp sot_loader_basic.cpp)
66-
target_link_libraries(sot_loader Boost::program_options ${catkin_LIBRARIES} ros_bridge
67-
dynamic_graph_bridge_msgs::dynamic_graph_bridge_msgs)
63+
target_link_libraries(sot_loader Boost::program_options ${catkin_LIBRARIES} ros_bridge)
6864
install(TARGETS sot_loader EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)

0 commit comments

Comments
 (0)