Compare commits

...

1 Commits

Author SHA1 Message Date
82417149e8 update tf3 2026-02-07 11:02:33 +07:00
4 changed files with 54 additions and 48 deletions

View File

@@ -16,7 +16,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
# Find dependencies # Find dependencies
find_package(Boost REQUIRED COMPONENTS thread) find_package(Boost REQUIRED COMPONENTS system thread)
find_package(Eigen3 REQUIRED) find_package(Eigen3 REQUIRED)
find_package(GTest REQUIRED) find_package(GTest REQUIRED)
@@ -36,6 +36,8 @@ 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()
# ======================================================== # ========================================================
@@ -44,13 +46,14 @@ else()
find_package(catkin REQUIRED COMPONENTS find_package(catkin REQUIRED COMPONENTS
robot_geometry_msgs robot_geometry_msgs
data_convert data_convert
tf3
) )
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_geometry_msgs data_convert tf3 CATKIN_DEPENDS robot_geometry_msgs data_convert
DEPENDS Eigen3 Boost DEPENDS Eigen3 Boost
) )
@@ -59,6 +62,7 @@ else()
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -97,6 +101,7 @@ else()
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
INTERFACE INTERFACE
${PACKAGES_DIR} ${PACKAGES_DIR}
${TF3_LIBRARY}
) )
endif() endif()
@@ -156,26 +161,26 @@ endif()
# ======================================================== # ========================================================
# Test executables # Test executables
# ======================================================== # ========================================================
# if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/test_tomsg_frommsg.cpp) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/test_tomsg_frommsg.cpp)
# add_executable(${PROJECT_NAME}_tomsg_frommsg_test test/test_tomsg_frommsg.cpp) add_executable(${PROJECT_NAME}_tomsg_frommsg_test test/test_tomsg_frommsg.cpp)
# target_link_libraries(${PROJECT_NAME}_tomsg_frommsg_test PRIVATE target_link_libraries(${PROJECT_NAME}_tomsg_frommsg_test PRIVATE
# ${PROJECT_NAME} ${PROJECT_NAME}
# GTest::GTest GTest::GTest
# GTest::Main GTest::Main
# Threads::Threads Boost::system Boost::thread
# tf3 ${TF3_LIBRARY}
# data_convert data_convert
# ) )
# endif() endif()
# if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/test_tf2_geometry_msgs.cpp) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/test_tf2_geometry_msgs.cpp)
# add_executable(${PROJECT_NAME}_geometry_msgs_test test/test_tf2_geometry_msgs.cpp) add_executable(${PROJECT_NAME}_geometry_msgs_test test/test_tf2_geometry_msgs.cpp)
# target_link_libraries(${PROJECT_NAME}_geometry_msgs_test PRIVATE target_link_libraries(${PROJECT_NAME}_geometry_msgs_test PRIVATE
# ${PROJECT_NAME} ${PROJECT_NAME}
# GTest::GTest GTest::GTest
# GTest::Main GTest::Main
# Threads::Threads Boost::system Boost::thread
# tf3 ${TF3_LIBRARY}
# data_convert data_convert
# ) )
# endif() endif()

View File

@@ -21,8 +21,6 @@
<build_depend>robot_geometry_msgs</build_depend> <build_depend>robot_geometry_msgs</build_depend>
<build_depend>data_convert</build_depend> <build_depend>data_convert</build_depend>
<build_depend>tf3</build_depend>
<run_depend>robot_geometry_msgs</run_depend> <run_depend>robot_geometry_msgs</run_depend>
<run_depend>data_convert</run_depend> <run_depend>data_convert</run_depend>
<run_depend>tf3</run_depend>
</package> </package>

View File

@@ -16,7 +16,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
# Find dependencies # Find dependencies
find_package(Boost REQUIRED COMPONENTS thread) find_package(Boost REQUIRED COMPONENTS system thread)
find_package(Eigen3 REQUIRED) find_package(Eigen3 REQUIRED)
find_package(GTest REQUIRED) find_package(GTest REQUIRED)
@@ -37,6 +37,8 @@ if (NOT BUILDING_WITH_CATKIN)
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()
# ======================================================== # ========================================================
@@ -45,14 +47,15 @@ else()
find_package(catkin REQUIRED COMPONENTS find_package(catkin REQUIRED COMPONENTS
robot_sensor_msgs robot_sensor_msgs
data_convert data_convert
tf3
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_sensor_msgs data_convert tf3 robot_geometry_msgs CATKIN_DEPENDS robot_sensor_msgs data_convert robot_geometry_msgs
DEPENDS Eigen3 Boost DEPENDS Eigen3 Boost
) )
@@ -61,6 +64,7 @@ else()
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${TF3_INCLUDE_DIR}
) )
endif() endif()
@@ -99,6 +103,7 @@ else()
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
INTERFACE INTERFACE
${PACKAGES_DIR} ${PACKAGES_DIR}
${TF3_LIBRARY}
) )
endif() endif()
@@ -158,19 +163,19 @@ endif()
# # ======================================================== # # ========================================================
# # Test executables # # Test executables
# # ======================================================== # # ========================================================
# if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/test_tf2_sensor_msgs.cpp) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/test_tf2_sensor_msgs.cpp)
# add_executable(${PROJECT_NAME}_test test/test_tf2_sensor_msgs.cpp) add_executable(${PROJECT_NAME}_test test/test_tf2_sensor_msgs.cpp)
# target_include_directories(${PROJECT_NAME}_test PUBLIC target_include_directories(${PROJECT_NAME}_test PUBLIC
# ${EIGEN3_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}
# ${GTEST_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}
# ) )
# target_link_libraries(${PROJECT_NAME}_test PRIVATE target_link_libraries(${PROJECT_NAME}_test PRIVATE
# ${PROJECT_NAME} ${PROJECT_NAME}
# GTest::GTest GTest::GTest
# GTest::Main GTest::Main
# Threads::Threads Boost::system Boost::thread
# robot_geometry_msgs robot_geometry_msgs
# tf3 ${TF3_LIBRARY}
# data_convert data_convert
# ) )
# endif() endif()

View File

@@ -20,12 +20,10 @@
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend> <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>robot_sensor_msgs</build_depend> <build_depend>robot_sensor_msgs</build_depend>
<build_depend>tf3</build_depend>
<build_depend>robot_geometry_msgs</build_depend> <build_depend>robot_geometry_msgs</build_depend>
<build_depend>data_convert</build_depend> <build_depend>data_convert</build_depend>
<run_depend>robot_sensor_msgs</run_depend> <run_depend>robot_sensor_msgs</run_depend>
<run_depend>robot_geometry_msgs</run_depend> <run_depend>robot_geometry_msgs</run_depend>
<run_depend>data_convert</run_depend> <run_depend>data_convert</run_depend>
<run_depend>tf3</run_depend>
</package> </package>