update tf3

This commit is contained in:
2026-02-07 11:06:51 +07:00
parent 81714a242d
commit 3f3425228c
21 changed files with 107 additions and 71 deletions

View File

@@ -30,10 +30,6 @@ message(STATUS "========================================")
# Build các packages theo thứ tự phụ thuộc # Build các packages theo thứ tự phụ thuộc
# 1. Core libraries (header-only hoặc base libraries) # 1. Core libraries (header-only hoặc base libraries)
# if (NOT TARGET tf3)
# add_subdirectory(${CMAKE_SOURCE_DIR}/src/Libraries/tf3)
# endif()
if (NOT TARGET robot_time) if (NOT TARGET robot_time)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/Libraries/robot_time) add_subdirectory(${CMAKE_SOURCE_DIR}/src/Libraries/robot_time)
endif() endif()

View File

@@ -41,6 +41,8 @@ if (NOT BUILDING_WITH_CATKIN)
robot_cpp robot_cpp
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
else() else()
# ======================================================== # ========================================================
@@ -53,16 +55,18 @@ else()
robot_nav_msgs robot_nav_msgs
robot_nav_2d_msgs robot_nav_2d_msgs
robot_nav_2d_utils robot_nav_2d_utils
tf3
robot_tf3_geometry_msgs robot_tf3_geometry_msgs
robot_time robot_time
robot_cpp robot_cpp
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
find_package(Boost REQUIRED COMPONENTS system)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS robot_costmap_2d robot_nav_core robot_geometry_msgs robot_nav_msgs tf3 robot_tf3_geometry_msgs robot_time robot_cpp CATKIN_DEPENDS robot_costmap_2d robot_nav_core robot_geometry_msgs robot_nav_msgs robot_tf3_geometry_msgs robot_time robot_cpp
DEPENDS Boost DEPENDS Boost
) )
@@ -70,6 +74,7 @@ else()
include include
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -92,6 +97,7 @@ if(BUILDING_WITH_CATKIN)
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PUBLIC ${catkin_LIBRARIES} PUBLIC ${catkin_LIBRARIES}
PRIVATE Boost::filesystem Boost::system PRIVATE Boost::filesystem Boost::system
${TF3_LIBRARY}
) )
else() else()
@@ -107,6 +113,7 @@ else()
${PACKAGES_DIR} ${PACKAGES_DIR}
PRIVATE PRIVATE
Boost::filesystem Boost::system Boost::filesystem Boost::system
${TF3_LIBRARY}
) )
set_target_properties(${PROJECT_NAME} PROPERTIES set_target_properties(${PROJECT_NAME} PROPERTIES

View File

@@ -37,8 +37,8 @@
<build_depend>robot_nav_2d_utils</build_depend> <build_depend>robot_nav_2d_utils</build_depend>
<run_depend>robot_nav_2d_utils</run_depend> <run_depend>robot_nav_2d_utils</run_depend>
<build_depend>tf3</build_depend>
<run_depend>tf3</run_depend>
<build_depend>robot_tf3_geometry_msgs</build_depend> <build_depend>robot_tf3_geometry_msgs</build_depend>
<run_depend>robot_tf3_geometry_msgs</run_depend> <run_depend>robot_tf3_geometry_msgs</run_depend>

View File

@@ -46,6 +46,8 @@ if (NOT BUILDING_WITH_CATKIN)
angles angles
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
else() else()
# ======================================================== # ========================================================
@@ -62,17 +64,19 @@ else()
mkt_msgs mkt_msgs
score_algorithm score_algorithm
robot_costmap_2d robot_costmap_2d
tf3
robot_tf3_geometry_msgs robot_tf3_geometry_msgs
data_convert data_convert
robot_cpp robot_cpp
angles angles
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
find_package(Boost REQUIRED COMPONENTS system)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME} ${PROJECT_NAME}_utils LIBRARIES ${PROJECT_NAME} ${PROJECT_NAME}_utils
CATKIN_DEPENDS robot_geometry_msgs robot_nav_msgs robot_std_msgs robot_visualization_msgs robot_nav_2d_msgs robot_nav_2d_utils robot_nav_core2 mkt_msgs score_algorithm robot_costmap_2d tf3 robot_tf3_geometry_msgs data_convert robot_cpp angles CATKIN_DEPENDS robot_geometry_msgs robot_nav_msgs robot_std_msgs robot_visualization_msgs robot_nav_2d_msgs robot_nav_2d_utils robot_nav_core2 mkt_msgs score_algorithm robot_costmap_2d robot_tf3_geometry_msgs data_convert robot_cpp angles
DEPENDS Boost DEPENDS Boost
) )
@@ -80,6 +84,7 @@ else()
include include
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -117,12 +122,14 @@ if(BUILDING_WITH_CATKIN)
target_link_libraries(${PROJECT_NAME}_utils target_link_libraries(${PROJECT_NAME}_utils
PUBLIC ${catkin_LIBRARIES} PUBLIC ${catkin_LIBRARIES}
PRIVATE Boost::system PRIVATE Boost::system
${TF3_LIBRARY}
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PUBLIC ${PROJECT_NAME}_utils PUBLIC ${PROJECT_NAME}_utils
PUBLIC ${catkin_LIBRARIES} PUBLIC ${catkin_LIBRARIES}
PRIVATE Boost::system PRIVATE Boost::system
${TF3_LIBRARY}
) )
else() else()
@@ -152,6 +159,7 @@ else()
${PACKAGES_DIR} ${PACKAGES_DIR}
PRIVATE PRIVATE
Boost::system Boost::system
${TF3_LIBRARY}
) )
set_target_properties(${PROJECT_NAME}_utils PROPERTIES set_target_properties(${PROJECT_NAME}_utils PROPERTIES

View File

@@ -49,8 +49,8 @@
<build_depend>robot_costmap_2d</build_depend> <build_depend>robot_costmap_2d</build_depend>
<run_depend>robot_costmap_2d</run_depend> <run_depend>robot_costmap_2d</run_depend>
<build_depend>tf3</build_depend>
<run_depend>tf3</run_depend>
<build_depend>robot_tf3_geometry_msgs</build_depend> <build_depend>robot_tf3_geometry_msgs</build_depend>
<run_depend>robot_tf3_geometry_msgs</run_depend> <run_depend>robot_tf3_geometry_msgs</run_depend>

View File

@@ -39,6 +39,8 @@ if (NOT BUILDING_WITH_CATKIN)
data_convert data_convert
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
else() else()
# ======================================================== # ========================================================
@@ -50,13 +52,13 @@ else()
robot_nav_msgs robot_nav_msgs
nav_grid nav_grid
robot_nav_core2 robot_nav_core2
tf3
robot_tf3_geometry_msgs robot_tf3_geometry_msgs
robot_cpp robot_cpp
) )
# Find dependencies # Find dependencies
find_package(Boost REQUIRED COMPONENTS system thread) find_package(Boost REQUIRED COMPONENTS system thread)
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
@@ -69,6 +71,7 @@ else()
include include
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -101,31 +104,37 @@ else()
PUBLIC PUBLIC
${PACKAGES_DIR} ${PACKAGES_DIR}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${TF3_LIBRARY}
) )
target_link_libraries(${PROJECT_NAME}_path_ops target_link_libraries(${PROJECT_NAME}_path_ops
PUBLIC PUBLIC
${PACKAGES_DIR} ${PACKAGES_DIR}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${TF3_LIBRARY}
) )
target_link_libraries(${PROJECT_NAME}_polygons target_link_libraries(${PROJECT_NAME}_polygons
PUBLIC PUBLIC
${PACKAGES_DIR} ${PACKAGES_DIR}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${TF3_LIBRARY}
) )
target_link_libraries(${PROJECT_NAME}_bounds target_link_libraries(${PROJECT_NAME}_bounds
PUBLIC PUBLIC
${PACKAGES_DIR} ${PACKAGES_DIR}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${TF3_LIBRARY}
) )
target_link_libraries(${PROJECT_NAME}_tf_help target_link_libraries(${PROJECT_NAME}_tf_help
PUBLIC PUBLIC
${PACKAGES_DIR} ${PACKAGES_DIR}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${TF3_LIBRARY}
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
INTERFACE INTERFACE
${PACKAGES_DIR} ${PACKAGES_DIR}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${TF3_LIBRARY}
) )
set_target_properties(${PROJECT_NAME}_conversions PROPERTIES set_target_properties(${PROJECT_NAME}_conversions PROPERTIES
@@ -159,31 +168,37 @@ else()
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
${TF3_INCLUDE_DIR}
) )
target_include_directories(${PROJECT_NAME}_path_ops target_include_directories(${PROJECT_NAME}_path_ops
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
${TF3_INCLUDE_DIR}
) )
target_include_directories(${PROJECT_NAME}_polygons target_include_directories(${PROJECT_NAME}_polygons
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
${TF3_INCLUDE_DIR}
) )
target_include_directories(${PROJECT_NAME}_bounds target_include_directories(${PROJECT_NAME}_bounds
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
${TF3_INCLUDE_DIR}
) )
target_include_directories(${PROJECT_NAME}_tf_help target_include_directories(${PROJECT_NAME}_tf_help
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
${TF3_INCLUDE_DIR}
) )
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME}
INTERFACE INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -231,7 +246,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, Boost") message(STATUS "Dependencies: robot_nav_2d_msgs, robot_geometry_msgs, robot_nav_msgs, nav_grid, robot_nav_core2, Boost")
message(STATUS "=================================") message(STATUS "=================================")
endif() endif()

View File

@@ -24,7 +24,6 @@
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend> <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>tf3</build_depend>
<build_depend>robot_time</build_depend> <build_depend>robot_time</build_depend>
<build_depend>robot_geometry_msgs</build_depend> <build_depend>robot_geometry_msgs</build_depend>
<build_depend>robot_protocol_msgs</build_depend> <build_depend>robot_protocol_msgs</build_depend>
@@ -34,7 +33,7 @@
<build_depend>robot_sensor_msgs</build_depend> <build_depend>robot_sensor_msgs</build_depend>
<build_depend>robot_map_msgs</build_depend> <build_depend>robot_map_msgs</build_depend>
<run_depend>tf3</run_depend>
<run_depend>robot_time</run_depend> <run_depend>robot_time</run_depend>
<run_depend>robot_geometry_msgs</run_depend> <run_depend>robot_geometry_msgs</run_depend>
<run_depend>robot_protocol_msgs</run_depend> <run_depend>robot_protocol_msgs</run_depend>

View File

@@ -30,7 +30,7 @@ if (NOT BUILDING_WITH_CATKIN)
tf3 tf3
robot_protocol_msgs robot_protocol_msgs
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
else() else()
# ======================================================== # ========================================================
@@ -38,19 +38,19 @@ else()
# ======================================================== # ========================================================
find_package(catkin REQUIRED COMPONENTS find_package(catkin REQUIRED COMPONENTS
robot_costmap_2d robot_costmap_2d
tf3
robot_protocol_msgs robot_protocol_msgs
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
# LIBRARIES không cần vì đây là header-only library # LIBRARIES không cần vì đây là header-only library
CATKIN_DEPENDS robot_costmap_2d tf3 robot_protocol_msgs CATKIN_DEPENDS robot_costmap_2d robot_protocol_msgs
) )
include_directories( include_directories(
include include
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -89,6 +89,7 @@ else()
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
INTERFACE INTERFACE
${PACKAGES_DIR} ${PACKAGES_DIR}
${TF3_LIBRARY}
) )
endif() endif()

View File

@@ -22,8 +22,8 @@
<build_depend>robot_costmap_2d</build_depend> <build_depend>robot_costmap_2d</build_depend>
<run_depend>robot_costmap_2d</run_depend> <run_depend>robot_costmap_2d</run_depend>
<build_depend>tf3</build_depend>
<run_depend>tf3</run_depend>
<build_depend>robot_protocol_msgs</build_depend> <build_depend>robot_protocol_msgs</build_depend>
<run_depend>robot_protocol_msgs</run_depend> <run_depend>robot_protocol_msgs</run_depend>

View File

@@ -33,7 +33,7 @@ if (NOT BUILDING_WITH_CATKIN)
robot_cpp robot_cpp
robot_geometry_msgs robot_geometry_msgs
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
else() else()
# ======================================================== # ========================================================
@@ -41,22 +41,22 @@ else()
# ======================================================== # ========================================================
find_package(catkin REQUIRED COMPONENTS find_package(catkin REQUIRED COMPONENTS
robot_costmap_2d robot_costmap_2d
tf3
nav_grid nav_grid
robot_nav_2d_msgs robot_nav_2d_msgs
robot_cpp robot_cpp
robot_geometry_msgs robot_geometry_msgs
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
# LIBRARIES không cần vì đây là header-only library # LIBRARIES không cần vì đây là header-only library
CATKIN_DEPENDS robot_costmap_2d tf3 nav_grid robot_nav_2d_msgs robot_cpp robot_geometry_msgs CATKIN_DEPENDS robot_costmap_2d nav_grid robot_nav_2d_msgs robot_cpp robot_geometry_msgs
) )
include_directories( include_directories(
include include
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -80,6 +80,7 @@ if(BUILDING_WITH_CATKIN)
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
INTERFACE INTERFACE
${catkin_LIBRARIES} ${catkin_LIBRARIES}
${TF3_LIBRARY}
) )
else() else()
@@ -95,6 +96,7 @@ else()
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
INTERFACE INTERFACE
${PACKAGES_DIR} ${PACKAGES_DIR}
${TF3_LIBRARY}
) )
endif() endif()
@@ -147,6 +149,6 @@ else()
foreach(hdr ${HEADERS}) foreach(hdr ${HEADERS})
message(STATUS " - ${hdr}") message(STATUS " - ${hdr}")
endforeach() endforeach()
message(STATUS "Dependencies: robot_costmap_2d, tf3, nav_grid, robot_nav_2d_msgs, robot_cpp, robot_geometry_msgs") message(STATUS "Dependencies: robot_costmap_2d, nav_grid, robot_nav_2d_msgs, robot_cpp, robot_geometry_msgs")
message(STATUS "=================================") message(STATUS "=================================")
endif() endif()

View File

@@ -22,8 +22,8 @@
<build_depend>robot_costmap_2d</build_depend> <build_depend>robot_costmap_2d</build_depend>
<run_depend>robot_costmap_2d</run_depend> <run_depend>robot_costmap_2d</run_depend>
<build_depend>tf3</build_depend>
<run_depend>tf3</run_depend>
<build_depend>nav_grid</build_depend> <build_depend>nav_grid</build_depend>
<run_depend>nav_grid</run_depend> <run_depend>nav_grid</run_depend>

View File

@@ -34,6 +34,7 @@ if (NOT BUILDING_WITH_CATKIN)
tf3 tf3
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
else() else()
# ======================================================== # ========================================================
@@ -43,16 +44,15 @@ else()
robot_nav_core robot_nav_core
robot_costmap_2d robot_costmap_2d
robot_cpp robot_cpp
tf3
) )
# Find dependencies
find_package(Boost REQUIRED COMPONENTS system thread) find_package(Boost REQUIRED COMPONENTS system thread)
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
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
DEPENDS Boost DEPENDS Boost
) )
@@ -60,6 +60,7 @@ else()
include include
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -77,6 +78,7 @@ else()
PUBLIC PUBLIC
${PACKAGES_DIR} ${PACKAGES_DIR}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${TF3_LIBRARY}
) )
set_target_properties(${PROJECT_NAME} PROPERTIES set_target_properties(${PROJECT_NAME} PROPERTIES
@@ -89,6 +91,7 @@ else()
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -136,6 +139,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, Boost") message(STATUS "Dependencies: robot_nav_core, robot_costmap_2d, robot_cpp, Boost")
message(STATUS "=================================") message(STATUS "=================================")
endif() endif()

View File

@@ -22,6 +22,6 @@
<build_depend>robot_cpp</build_depend> <build_depend>robot_cpp</build_depend>
<run_depend>robot_cpp</run_depend> <run_depend>robot_cpp</run_depend>
<build_depend>tf3</build_depend>
<run_depend>tf3</run_depend>
</package> </package>

View File

@@ -37,6 +37,7 @@ if (NOT BUILDING_WITH_CATKIN)
robot_nav_core robot_nav_core
robot_costmap_2d robot_costmap_2d
plugins plugins
tf3
robot_tf3_sensor_msgs robot_tf3_sensor_msgs
robot_tf3_geometry_msgs robot_tf3_geometry_msgs
data_convert data_convert
@@ -44,7 +45,7 @@ if (NOT BUILDING_WITH_CATKIN)
robot_cpp robot_cpp
robot_move_base_msgs robot_move_base_msgs
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
else() else()
# ======================================================== # ========================================================
@@ -63,7 +64,7 @@ else()
robot_cpp robot_cpp
robot_move_base_msgs robot_move_base_msgs
) )
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
@@ -75,6 +76,7 @@ else()
include include
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -98,12 +100,14 @@ if(BUILDING_WITH_CATKIN)
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
${TF3_INCLUDE_DIR}
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PUBLIC ${catkin_LIBRARIES} PUBLIC ${catkin_LIBRARIES}
PRIVATE Boost::filesystem Boost::system PRIVATE Boost::filesystem Boost::system
dl dl
${TF3_LIBRARY}
) )
else() else()
@@ -112,11 +116,13 @@ else()
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
${TF3_INCLUDE_DIR}
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PUBLIC PUBLIC
${PACKAGES_DIR} ${PACKAGES_DIR}
${TF3_LIBRARY}
PRIVATE PRIVATE
Boost::filesystem Boost::system Boost::filesystem Boost::system
yaml-cpp yaml-cpp
@@ -134,30 +140,32 @@ 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
# ) ${TF3_LIBRARY}
# else() )
# target_link_libraries(${PROJECT_NAME}_main PRIVATE else()
# ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}_main PRIVATE
# robot_cpp ${PROJECT_NAME}
# Boost::filesystem Boost::system robot_cpp
# dl Boost::filesystem Boost::system
# ) dl
${TF3_LIBRARY}
)
# # 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,8 +173,7 @@ 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,9 +187,7 @@ 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