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

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)
# 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()

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

@@ -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