HiepLM/pnkx_nav_core
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete console_brigde

Browse Source
This commit is contained in:
hoangson02
2026-02-06 10:15:50 +00:00
parent 5e2f7bc712
commit 81714a242d
8 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Libraries/common_msgs

Submodule src/Libraries/common_msgs updated: 98543e6c54...b6c387dd0f

2
src/Libraries/costmap_2d

Submodule src/Libraries/costmap_2d updated: 9026c03e1e...ed43912c33

2
src/Libraries/geometry2

Submodule src/Libraries/geometry2 updated: ff90ea2f29...c8d8d3d4a9

5
src/Libraries/robot_cpp/CMakeLists.txt
View File

@@ -17,7 +17,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
# Find dependencies # Find dependencies
find_package(yaml-cpp REQUIRED) find_package(yaml-cpp REQUIRED)
find_package(console_bridge REQUIRED)
if (NOT BUILDING_WITH_CATKIN) if (NOT BUILDING_WITH_CATKIN)
@@ -48,7 +47,7 @@ else()
INCLUDE_DIRS include INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS robot_xmlrpcpp robot_time 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 # linked via target_link_libraries, not via catkin_package DEPENDS
) )
@@ -222,7 +221,7 @@ else()
message(STATUS "Project: ${PROJECT_NAME}") message(STATUS "Project: ${PROJECT_NAME}")
message(STATUS "Version: ${PROJECT_VERSION}") message(STATUS "Version: ${PROJECT_VERSION}")
message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}") 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 "=================================") message(STATUS "=================================")
endif() endif()

6
src/Libraries/robot_nav_2d_utils/CMakeLists.txt
View File

@@ -15,7 +15,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
# Find dependencies # Find dependencies
find_package(console_bridge REQUIRED)
find_package(Boost REQUIRED COMPONENTS system thread) find_package(Boost REQUIRED COMPONENTS system thread)
if (NOT BUILDING_WITH_CATKIN) if (NOT BUILDING_WITH_CATKIN)
@@ -57,14 +56,13 @@ else()
) )
# Find dependencies # Find dependencies
find_package(console_bridge REQUIRED)
find_package(Boost REQUIRED COMPONENTS system thread) find_package(Boost REQUIRED COMPONENTS system thread)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME}_conversions ${PROJECT_NAME}_path_ops ${PROJECT_NAME}_polygons ${PROJECT_NAME}_bounds ${PROJECT_NAME}_tf_help ${PROJECT_NAME} 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 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( include_directories(
@@ -233,7 +231,7 @@ else()
message(STATUS "Version: ${PROJECT_VERSION}") message(STATUS "Version: ${PROJECT_VERSION}")
message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}") 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 "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 "=================================") message(STATUS "=================================")
endif() endif()

2
src/Libraries/xmlrpcpp

Submodule src/Libraries/xmlrpcpp updated: 948405bba4...727233624e

7
src/Navigations/Libraries/robot_clear_costmap_recovery/CMakeLists.txt
View File

@@ -15,7 +15,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
# Find dependencies # Find dependencies
find_package(console_bridge REQUIRED)
find_package(Boost REQUIRED COMPONENTS system thread) find_package(Boost REQUIRED COMPONENTS system thread)
if (NOT BUILDING_WITH_CATKIN) if (NOT BUILDING_WITH_CATKIN)
@@ -33,7 +32,6 @@ if (NOT BUILDING_WITH_CATKIN)
robot_costmap_2d robot_costmap_2d
robot_cpp robot_cpp
tf3 tf3
console_bridge
) )
else() else()
@@ -49,14 +47,13 @@ else()
) )
# Find dependencies # Find dependencies
find_package(console_bridge REQUIRED)
find_package(Boost REQUIRED COMPONENTS system thread) find_package(Boost REQUIRED COMPONENTS system thread)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS robot_cpp robot_nav_core robot_costmap_2d tf3 CATKIN_DEPENDS robot_cpp robot_nav_core robot_costmap_2d tf3
DEPENDS console_bridge Boost DEPENDS Boost
) )
include_directories( include_directories(
@@ -139,6 +136,6 @@ else()
message(STATUS "Version: ${PROJECT_VERSION}") message(STATUS "Version: ${PROJECT_VERSION}")
message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}") message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}")
message(STATUS "Libraries: ${PROJECT_NAME}") 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 "=================================") message(STATUS "=================================")
endif() endif()

50
src/Navigations/Packages/move_base/CMakeLists.txt
View File

@@ -134,30 +134,30 @@ endif()
# ======================================================== # ========================================================
# Executable # 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) # if(BUILDING_WITH_CATKIN)
target_link_libraries(${PROJECT_NAME}_main PRIVATE # target_link_libraries(${PROJECT_NAME}_main PRIVATE
${PROJECT_NAME} # ${PROJECT_NAME}
robot_cpp # robot_cpp
Boost::filesystem Boost::system # Boost::filesystem Boost::system
dl # dl
) # )
else() # else()
target_link_libraries(${PROJECT_NAME}_main PRIVATE # target_link_libraries(${PROJECT_NAME}_main PRIVATE
${PROJECT_NAME} # ${PROJECT_NAME}
robot_cpp # robot_cpp
Boost::filesystem Boost::system # Boost::filesystem Boost::system
dl # dl
) # )
# Configure RPATH to find libraries in devel space # # Configure RPATH to find libraries in devel space
set_target_properties(${PROJECT_NAME}_main PROPERTIES # set_target_properties(${PROJECT_NAME}_main PROPERTIES
BUILD_WITH_INSTALL_RPATH FALSE # BUILD_WITH_INSTALL_RPATH FALSE
INSTALL_RPATH_USE_LINK_PATH TRUE # INSTALL_RPATH_USE_LINK_PATH TRUE
BUILD_RPATH "${CMAKE_BINARY_DIR}" # BUILD_RPATH "${CMAKE_BINARY_DIR}"
) # )
endif() # endif()
# ======================================================== # ========================================================
# Install # Install
@@ -165,7 +165,8 @@ endif()
if(BUILDING_WITH_CATKIN) if(BUILDING_WITH_CATKIN)
## Mark libraries for installation ## Mark libraries for installation
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html ## 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} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
@@ -180,7 +181,8 @@ if(BUILDING_WITH_CATKIN)
else() else()
install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_main # install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_main
install(TARGETS ${PROJECT_NAME}
EXPORT ${PROJECT_NAME}-targets EXPORT ${PROJECT_NAME}-targets
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib LIBRARY DESTINATION lib