update tf3
This commit is contained in:
Submodule src/Libraries/costmap_2d updated: ed43912c33...eb52edc6e8
Submodule src/Libraries/geometry2 updated: c8d8d3d4a9...82417149e8
Submodule src/Libraries/laser_geometry updated: 4fb3fdc28c...50062ef549
@@ -39,6 +39,8 @@ if (NOT BUILDING_WITH_CATKIN)
|
||||
data_convert
|
||||
)
|
||||
|
||||
find_library(TF3_LIBRARY NAMES tf3 PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu)
|
||||
|
||||
else()
|
||||
|
||||
# ========================================================
|
||||
@@ -50,13 +52,13 @@ else()
|
||||
robot_nav_msgs
|
||||
nav_grid
|
||||
robot_nav_core2
|
||||
tf3
|
||||
robot_tf3_geometry_msgs
|
||||
robot_cpp
|
||||
)
|
||||
|
||||
# Find dependencies
|
||||
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(
|
||||
INCLUDE_DIRS include
|
||||
@@ -69,6 +71,7 @@ else()
|
||||
include
|
||||
${catkin_INCLUDE_DIRS}
|
||||
${Boost_INCLUDE_DIRS}
|
||||
${TF3_INCLUDE_DIR}
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -101,31 +104,37 @@ else()
|
||||
PUBLIC
|
||||
${PACKAGES_DIR}
|
||||
${Boost_LIBRARIES}
|
||||
${TF3_LIBRARY}
|
||||
)
|
||||
target_link_libraries(${PROJECT_NAME}_path_ops
|
||||
PUBLIC
|
||||
${PACKAGES_DIR}
|
||||
${Boost_LIBRARIES}
|
||||
${TF3_LIBRARY}
|
||||
)
|
||||
target_link_libraries(${PROJECT_NAME}_polygons
|
||||
PUBLIC
|
||||
${PACKAGES_DIR}
|
||||
${Boost_LIBRARIES}
|
||||
${TF3_LIBRARY}
|
||||
)
|
||||
target_link_libraries(${PROJECT_NAME}_bounds
|
||||
PUBLIC
|
||||
${PACKAGES_DIR}
|
||||
${Boost_LIBRARIES}
|
||||
${TF3_LIBRARY}
|
||||
)
|
||||
target_link_libraries(${PROJECT_NAME}_tf_help
|
||||
PUBLIC
|
||||
${PACKAGES_DIR}
|
||||
${Boost_LIBRARIES}
|
||||
${TF3_LIBRARY}
|
||||
)
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
INTERFACE
|
||||
${PACKAGES_DIR}
|
||||
${Boost_LIBRARIES}
|
||||
${TF3_LIBRARY}
|
||||
)
|
||||
|
||||
set_target_properties(${PROJECT_NAME}_conversions PROPERTIES
|
||||
@@ -159,31 +168,37 @@ else()
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<INSTALL_INTERFACE:include>
|
||||
${TF3_INCLUDE_DIR}
|
||||
)
|
||||
target_include_directories(${PROJECT_NAME}_path_ops
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<INSTALL_INTERFACE:include>
|
||||
${TF3_INCLUDE_DIR}
|
||||
)
|
||||
target_include_directories(${PROJECT_NAME}_polygons
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<INSTALL_INTERFACE:include>
|
||||
${TF3_INCLUDE_DIR}
|
||||
)
|
||||
target_include_directories(${PROJECT_NAME}_bounds
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<INSTALL_INTERFACE:include>
|
||||
${TF3_INCLUDE_DIR}
|
||||
)
|
||||
target_include_directories(${PROJECT_NAME}_tf_help
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<INSTALL_INTERFACE:include>
|
||||
${TF3_INCLUDE_DIR}
|
||||
)
|
||||
target_include_directories(${PROJECT_NAME}
|
||||
INTERFACE
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<INSTALL_INTERFACE:include>
|
||||
${TF3_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
endif()
|
||||
@@ -231,7 +246,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, Boost")
|
||||
message(STATUS "Dependencies: robot_nav_2d_msgs, robot_geometry_msgs, robot_nav_msgs, nav_grid, robot_nav_core2, Boost")
|
||||
message(STATUS "=================================")
|
||||
endif()
|
||||
|
||||
|
||||
Submodule src/Libraries/voxel_grid updated: 3daeae6147...64983bc6f7
Submodule src/Libraries/xmlrpcpp updated: 727233624e...948405bba4
Reference in New Issue
Block a user