Skip to content

Commit 8a8e266

Browse files
committed
Update targets for grid_map_ros
1 parent 4e3fdf3 commit 8a8e266

4 files changed

Lines changed: 15 additions & 4 deletions

File tree

easynav_gridmap_astar_planner/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@ find_package(grid_map_msgs REQUIRED)
2020
add_library(${PROJECT_NAME} SHARED
2121
src/easynav_gridmap_astar_planner/GridMapAStarPlanner.cpp
2222
)
23+
2324
target_include_directories(${PROJECT_NAME} PUBLIC
2425
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
2526
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
27+
${grid_map_ros_INCLUDE_DIRS}
2628
)
29+
2730
target_link_libraries(${PROJECT_NAME} PUBLIC
2831
easynav_common::easynav_common
2932
easynav_core::easynav_core
3033
pluginlib::pluginlib
31-
grid_map_ros::grid_map_ros
34+
${grid_map_ros_LIBRARIES}
3235
${nav_msgs_TARGETS}
3336
${grid_map_msgs_TARGETS}
3437
)

easynav_gridmap_maps_manager/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set(dependencies
3030
rclcpp_lifecycle::rclcpp_lifecycle
3131
easynav_common::easynav_common
3232
easynav_core::easynav_core
33-
grid_map_ros::grid_map_ros
33+
${grid_map_ros_LIBRARIES}
3434
ament_index_cpp::ament_index_cpp
3535
cv_bridge::cv_bridge
3636
${sensor_msgs_TARGETS}
@@ -46,11 +46,14 @@ add_library(${PROJECT_NAME} SHARED
4646
src/easynav_gridmap_maps_manager/GridmapMapsBuilderNode.cpp
4747
src/easynav_gridmap_maps_manager/utils.cpp
4848
)
49+
4950
target_include_directories(${PROJECT_NAME} PUBLIC
5051
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
5152
$<BUILD_INTERFACE:${yaml-cpp_INCLUDE_DIRS}>
5253
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
54+
${grid_map_ros_INCLUDE_DIRS}
5355
)
56+
5457
target_link_libraries(${PROJECT_NAME} PUBLIC ${dependencies})
5558

5659
# Executable
@@ -59,7 +62,8 @@ target_include_directories(${PROJECT_NAME} PUBLIC
5962
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
6063
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
6164
)
62-
target_link_libraries(gridmap_maps_builder_main ${PROJECT_NAME} ${dependencies})
65+
66+
target_link_libraries(gridmap_maps_builder_main ${PROJECT_NAME} ${dependencies} ${grid_map_ros_LIBRARIES})
6367

6468
install(
6569
DIRECTORY include/

easynav_gridmap_maps_manager/src/easynav_gridmap_maps_manager/utils.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323

2424
#include <fstream>
25+
#include <filesystem>
2526

2627
#include "grid_map_msgs/msg/grid_map.hpp"
2728
#include "grid_map_ros/grid_map_ros.hpp"

easynav_gridmap_rrtstar_planner/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,20 @@ add_library(${PROJECT_NAME} SHARED
2121
src/easynav_gridmap_rrtstar_planner/GridMapRRTStarPlanner.cpp
2222
src/easynav_gridmap_rrtstar_planner/KDTree.cpp
2323
)
24+
2425
target_include_directories(${PROJECT_NAME} PUBLIC
2526
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
2627
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
28+
${grid_map_ros_INCLUDE_DIRS}
2729
)
30+
2831
target_link_libraries(${PROJECT_NAME} PUBLIC
2932
easynav_common::easynav_common
3033
easynav_core::easynav_core
3134
pluginlib::pluginlib
32-
grid_map_ros::grid_map_ros
3335
${nav_msgs_TARGETS}
3436
${grid_map_msgs_TARGETS}
37+
${grid_map_ros_LIBRARIES}
3538
)
3639

3740
install(

0 commit comments

Comments
 (0)