From 81714a242ddcb7fbad1d904fed4245df64c42fe4 Mon Sep 17 00:00:00 2001 From: hoangson02 Date: Fri, 6 Feb 2026 10:15:50 +0000 Subject: [PATCH] delete console_brigde --- src/Libraries/common_msgs | 2 +- src/Libraries/costmap_2d | 2 +- src/Libraries/geometry2 | 2 +- src/Libraries/robot_cpp/CMakeLists.txt | 5 +- .../robot_nav_2d_utils/CMakeLists.txt | 6 +-- src/Libraries/xmlrpcpp | 2 +- .../CMakeLists.txt | 7 +-- .../Packages/move_base/CMakeLists.txt | 50 ++++++++++--------- 8 files changed, 36 insertions(+), 40 deletions(-) diff --git a/src/Libraries/common_msgs b/src/Libraries/common_msgs index 98543e6..b6c387d 160000 --- a/src/Libraries/common_msgs +++ b/src/Libraries/common_msgs @@ -1 +1 @@ -Subproject commit 98543e6c540f48075f0a6976c83a884524956264 +Subproject commit b6c387dd0fcd4350edf2841767356ad6ee5f2c9e diff --git a/src/Libraries/costmap_2d b/src/Libraries/costmap_2d index 9026c03..ed43912 160000 --- a/src/Libraries/costmap_2d +++ b/src/Libraries/costmap_2d @@ -1 +1 @@ -Subproject commit 9026c03e1e3bbecdce224958c04147f9e9ae7fd2 +Subproject commit ed43912c33795256a4b9fc9664e536baf06fd4f1 diff --git a/src/Libraries/geometry2 b/src/Libraries/geometry2 index ff90ea2..c8d8d3d 160000 --- a/src/Libraries/geometry2 +++ b/src/Libraries/geometry2 @@ -1 +1 @@ -Subproject commit ff90ea2f297258555863a2b6e9cf8442ede3a481 +Subproject commit c8d8d3d4a97515b34ef87dc53a7a66f2f226de01 diff --git a/src/Libraries/robot_cpp/CMakeLists.txt b/src/Libraries/robot_cpp/CMakeLists.txt index c28eff9..3b941ee 100644 --- a/src/Libraries/robot_cpp/CMakeLists.txt +++ b/src/Libraries/robot_cpp/CMakeLists.txt @@ -17,7 +17,6 @@ set(CMAKE_CXX_EXTENSIONS OFF) # Find dependencies find_package(yaml-cpp REQUIRED) -find_package(console_bridge REQUIRED) if (NOT BUILDING_WITH_CATKIN) @@ -48,7 +47,7 @@ else() INCLUDE_DIRS include LIBRARIES ${PROJECT_NAME} CATKIN_DEPENDS robot_xmlrpcpp robot_time - # Note: yaml-cpp and console_bridge are system dependencies, + # Note: yaml-cpp are system dependencies, # linked via target_link_libraries, not via catkin_package DEPENDS ) @@ -222,7 +221,7 @@ else() message(STATUS "Project: ${PROJECT_NAME}") message(STATUS "Version: ${PROJECT_VERSION}") message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}") - message(STATUS "Dependencies: robot_xmlrpcpp, robot_time, yaml-cpp, console_bridge") + message(STATUS "Dependencies: robot_xmlrpcpp, robot_time, yaml-cpp") message(STATUS "=================================") endif() diff --git a/src/Libraries/robot_nav_2d_utils/CMakeLists.txt b/src/Libraries/robot_nav_2d_utils/CMakeLists.txt index a8fb7af..d03a1c3 100755 --- a/src/Libraries/robot_nav_2d_utils/CMakeLists.txt +++ b/src/Libraries/robot_nav_2d_utils/CMakeLists.txt @@ -15,7 +15,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) # Find dependencies -find_package(console_bridge REQUIRED) find_package(Boost REQUIRED COMPONENTS system thread) if (NOT BUILDING_WITH_CATKIN) @@ -57,14 +56,13 @@ else() ) # Find dependencies - find_package(console_bridge REQUIRED) find_package(Boost REQUIRED COMPONENTS system thread) catkin_package( INCLUDE_DIRS include LIBRARIES ${PROJECT_NAME}_conversions ${PROJECT_NAME}_path_ops ${PROJECT_NAME}_polygons ${PROJECT_NAME}_bounds ${PROJECT_NAME}_tf_help ${PROJECT_NAME} CATKIN_DEPENDS robot_cpp robot_geometry_msgs robot_nav_2d_msgs robot_nav_msgs nav_grid robot_nav_core2 - DEPENDS console_bridge Boost + DEPENDS Boost ) include_directories( @@ -233,7 +231,7 @@ else() message(STATUS "Version: ${PROJECT_VERSION}") message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}") message(STATUS "Libraries: ${PROJECT_NAME}_conversions, ${PROJECT_NAME}_path_ops, ${PROJECT_NAME}_polygons, ${PROJECT_NAME}_bounds, ${PROJECT_NAME}_tf_help") - message(STATUS "Dependencies: robot_nav_2d_msgs, robot_geometry_msgs, robot_nav_msgs, nav_grid, robot_nav_core2, tf3, console_bridge, Boost") + message(STATUS "Dependencies: robot_nav_2d_msgs, robot_geometry_msgs, robot_nav_msgs, nav_grid, robot_nav_core2, tf3, Boost") message(STATUS "=================================") endif() diff --git a/src/Libraries/xmlrpcpp b/src/Libraries/xmlrpcpp index 948405b..7272336 160000 --- a/src/Libraries/xmlrpcpp +++ b/src/Libraries/xmlrpcpp @@ -1 +1 @@ -Subproject commit 948405bba436a164cb27f1b24cbb2bcf8ca053b2 +Subproject commit 727233624ef6cd584e1265382297e6181bcf4d64 diff --git a/src/Navigations/Libraries/robot_clear_costmap_recovery/CMakeLists.txt b/src/Navigations/Libraries/robot_clear_costmap_recovery/CMakeLists.txt index be56ca7..13e5848 100644 --- a/src/Navigations/Libraries/robot_clear_costmap_recovery/CMakeLists.txt +++ b/src/Navigations/Libraries/robot_clear_costmap_recovery/CMakeLists.txt @@ -15,7 +15,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) # Find dependencies -find_package(console_bridge REQUIRED) find_package(Boost REQUIRED COMPONENTS system thread) if (NOT BUILDING_WITH_CATKIN) @@ -33,7 +32,6 @@ if (NOT BUILDING_WITH_CATKIN) robot_costmap_2d robot_cpp tf3 - console_bridge ) else() @@ -49,14 +47,13 @@ else() ) # Find dependencies - find_package(console_bridge REQUIRED) find_package(Boost REQUIRED COMPONENTS system thread) catkin_package( INCLUDE_DIRS include LIBRARIES ${PROJECT_NAME} CATKIN_DEPENDS robot_cpp robot_nav_core robot_costmap_2d tf3 - DEPENDS console_bridge Boost + DEPENDS Boost ) include_directories( @@ -139,6 +136,6 @@ else() message(STATUS "Version: ${PROJECT_VERSION}") message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}") message(STATUS "Libraries: ${PROJECT_NAME}") - message(STATUS "Dependencies: robot_nav_core, robot_costmap_2d, robot_cpp, tf3, console_bridge, Boost") + message(STATUS "Dependencies: robot_nav_core, robot_costmap_2d, robot_cpp, tf3, Boost") message(STATUS "=================================") endif() diff --git a/src/Navigations/Packages/move_base/CMakeLists.txt b/src/Navigations/Packages/move_base/CMakeLists.txt index ba6bd96..8961854 100644 --- a/src/Navigations/Packages/move_base/CMakeLists.txt +++ b/src/Navigations/Packages/move_base/CMakeLists.txt @@ -134,30 +134,30 @@ endif() # ======================================================== # Executable # ======================================================== -add_executable(${PROJECT_NAME}_main src/move_base_main.cpp) +# add_executable(${PROJECT_NAME}_main src/move_base_main.cpp) -if(BUILDING_WITH_CATKIN) - target_link_libraries(${PROJECT_NAME}_main PRIVATE - ${PROJECT_NAME} - robot_cpp - Boost::filesystem Boost::system - dl - ) -else() - target_link_libraries(${PROJECT_NAME}_main PRIVATE - ${PROJECT_NAME} - robot_cpp - Boost::filesystem Boost::system - dl - ) +# if(BUILDING_WITH_CATKIN) +# target_link_libraries(${PROJECT_NAME}_main PRIVATE +# ${PROJECT_NAME} +# robot_cpp +# Boost::filesystem Boost::system +# dl +# ) +# else() +# target_link_libraries(${PROJECT_NAME}_main PRIVATE +# ${PROJECT_NAME} +# robot_cpp +# Boost::filesystem Boost::system +# dl +# ) - # Configure RPATH to find libraries in devel space - set_target_properties(${PROJECT_NAME}_main PROPERTIES - BUILD_WITH_INSTALL_RPATH FALSE - INSTALL_RPATH_USE_LINK_PATH TRUE - BUILD_RPATH "${CMAKE_BINARY_DIR}" - ) -endif() +# # Configure RPATH to find libraries in devel space +# set_target_properties(${PROJECT_NAME}_main PROPERTIES +# BUILD_WITH_INSTALL_RPATH FALSE +# INSTALL_RPATH_USE_LINK_PATH TRUE +# BUILD_RPATH "${CMAKE_BINARY_DIR}" +# ) +# endif() # ======================================================== # Install @@ -165,7 +165,8 @@ endif() if(BUILDING_WITH_CATKIN) ## Mark libraries for installation ## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html - install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_main + # install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_main + install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} @@ -180,7 +181,8 @@ if(BUILDING_WITH_CATKIN) else() - install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_main + # install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_main + install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets ARCHIVE DESTINATION lib LIBRARY DESTINATION lib