merged master -> ros2

This commit is contained in:
matlabbe
2021-12-20 17:03:13 -05:00
parent 67de34b6a8
commit 07951eee08
9 changed files with 182 additions and 2 deletions
+14
View File
@@ -53,6 +53,7 @@ find_package(octomap_msgs)
#find_package(apriltag_msgs)
#find_package(find_object_2d)
find_package(move_base_msgs)
#find_package(fiducial_msgs)
## System dependencies are found with CMake's conventions
find_package(RTABMap 0.20.15 REQUIRED)
@@ -321,6 +322,19 @@ SET(Libraries
ADD_DEFINITIONS("-DWITH_MOVE_BASE_MSGS")
ENDIF(move_base_msgs_FOUND)
# If fiducial_msgs is found, add definition
IF(fiducial_msgs_FOUND)
MESSAGE(STATUS "WITH fiducial_msgs")
include_directories(
${fiducial_msgs_INCLUDE_DIRS}
)
SET(Libraries
${fiducial_msgs_LIBRARIES}
${Libraries}
)
ADD_DEFINITIONS("-DWITH_FIDUCIAL_MSGS")
ENDIF(fiducial_msgs_FOUND)
############################
## Declare a cpp library
############################