update
This commit is contained in:
@@ -17,7 +17,6 @@ find_package(catkin REQUIRED COMPONENTS
|
||||
delta_modbus
|
||||
nova5_control
|
||||
loc_core
|
||||
move_base_core
|
||||
amr_comunication
|
||||
vda5050_msgs
|
||||
)
|
||||
@@ -138,20 +137,27 @@ add_library(${PROJECT_NAME}
|
||||
src/amr_monitor.cpp
|
||||
src/amr_safety.cpp
|
||||
src/amr_opc_ua_server_api.cpp
|
||||
src/amr_vda_5050_client_api.cpp
|
||||
src/amr_make_plan_with_order.cpp
|
||||
# src/amr_vda_5050_client_api.cpp
|
||||
# src/amr_make_plan_with_order.cpp
|
||||
)
|
||||
|
||||
## Add cmake target dependencies of the library
|
||||
## as an example, code may need to be generated before libraries
|
||||
## either from message generation or dynamic reconfigure
|
||||
add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
|
||||
# Fix circular RPATH dependency: disable automatic RPATH detection to avoid cycle warnings
|
||||
# Libraries will be found via LD_LIBRARY_PATH or system paths
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||
SKIP_BUILD_RPATH TRUE
|
||||
BUILD_WITH_INSTALL_RPATH FALSE
|
||||
INSTALL_RPATH_USE_LINK_PATH FALSE
|
||||
)
|
||||
|
||||
## Declare a C++ executable
|
||||
## With catkin_make all packages are built within a single CMake context
|
||||
## The recommended prefix ensures that target names across packages don't collide
|
||||
add_executable(${PROJECT_NAME}_node src/amr_control_node.cpp)
|
||||
add_executable(vda_5050_api_test test/vda_5050_api.cpp)
|
||||
# add_executable(${PROJECT_NAME}_node src/amr_control_node.cpp)
|
||||
# add_executable(vda_5050_api_test test/vda_5050_api.cpp)
|
||||
|
||||
## Rename C++ executable without prefix
|
||||
## The above recommended prefix causes long target names, the following renames the
|
||||
@@ -161,17 +167,31 @@ add_executable(vda_5050_api_test test/vda_5050_api.cpp)
|
||||
|
||||
## Add cmake target dependencies of the executable
|
||||
## same as for the library above
|
||||
add_dependencies(${PROJECT_NAME}_node
|
||||
${PROJECT_NAME}
|
||||
${${PROJECT_NAME}_EXPORTED_TARGETS}
|
||||
${catkin_EXPORTED_TARGETS}
|
||||
)
|
||||
# add_dependencies(${PROJECT_NAME}_node
|
||||
# ${PROJECT_NAME}
|
||||
# ${${PROJECT_NAME}_EXPORTED_TARGETS}
|
||||
# ${catkin_EXPORTED_TARGETS}
|
||||
# )
|
||||
# Fix circular RPATH dependency: disable automatic RPATH detection to avoid cycle warnings
|
||||
# Libraries will be found via LD_LIBRARY_PATH or system paths
|
||||
# set_target_properties(${PROJECT_NAME}_node PROPERTIES
|
||||
# SKIP_BUILD_RPATH TRUE
|
||||
# BUILD_WITH_INSTALL_RPATH FALSE
|
||||
# INSTALL_RPATH_USE_LINK_PATH FALSE
|
||||
# )
|
||||
|
||||
add_dependencies(vda_5050_api_test
|
||||
${PROJECT_NAME}
|
||||
${${PROJECT_NAME}_EXPORTED_TARGETS}
|
||||
${catkin_EXPORTED_TARGETS}
|
||||
)
|
||||
# add_dependencies(vda_5050_api_test
|
||||
# ${PROJECT_NAME}
|
||||
# ${${PROJECT_NAME}_EXPORTED_TARGETS}
|
||||
# ${catkin_EXPORTED_TARGETS}
|
||||
# )
|
||||
# Fix circular RPATH dependency: disable automatic RPATH detection to avoid cycle warnings
|
||||
# Libraries will be found via LD_LIBRARY_PATH or system paths
|
||||
# set_target_properties(vda_5050_api_test PROPERTIES
|
||||
# SKIP_BUILD_RPATH TRUE
|
||||
# BUILD_WITH_INSTALL_RPATH FALSE
|
||||
# INSTALL_RPATH_USE_LINK_PATH FALSE
|
||||
# )
|
||||
|
||||
## Specify libraries to link a library or executable target against
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
@@ -180,17 +200,17 @@ target_link_libraries(${PROJECT_NAME}
|
||||
${Boost_LIBRARIES}
|
||||
)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}_node
|
||||
${PROJECT_NAME}
|
||||
${catkin_LIBRARIES}
|
||||
${Boost_LIBRARIES}
|
||||
)
|
||||
# target_link_libraries(${PROJECT_NAME}_node
|
||||
# ${PROJECT_NAME}
|
||||
# ${catkin_LIBRARIES}
|
||||
# ${Boost_LIBRARIES}
|
||||
# )
|
||||
|
||||
target_link_libraries(vda_5050_api_test
|
||||
${PROJECT_NAME}
|
||||
${catkin_LIBRARIES}
|
||||
${Boost_LIBRARIES}
|
||||
)
|
||||
# target_link_libraries(vda_5050_api_test
|
||||
# ${PROJECT_NAME}
|
||||
# ${catkin_LIBRARIES}
|
||||
# ${Boost_LIBRARIES}
|
||||
# )
|
||||
|
||||
|
||||
#############
|
||||
@@ -209,9 +229,9 @@ target_link_libraries(vda_5050_api_test
|
||||
|
||||
## Mark executables for installation
|
||||
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
|
||||
install(TARGETS ${PROJECT_NAME}_node vda_5050_api_test
|
||||
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
|
||||
)
|
||||
# install(TARGETS ${PROJECT_NAME}_node vda_5050_api_test
|
||||
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
|
||||
# )
|
||||
|
||||
## Mark libraries for installation
|
||||
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
|
||||
|
||||
Reference in New Issue
Block a user