Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/colcon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
apt update
rosdep update
source /opt/ros/${{matrix.config.rosdistro}}/setup.bash
rosdep install --from-paths src --ignore-src -y --skip-keys "slam_toolbox"
rosdep install --from-paths src --ignore-src -y --skip-keys "slam_toolbox octomap_server"
shell: bash
- name: Colcon Build (Release)
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/industrial-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ jobs:
# It also is out of date, so grid_map is just going to skip keys we are sure don't work.
- name: set ROSDEP_SKIP_KEYS to skip nav2 keys
if: ${{ matrix.env.ROS_DISTRO == 'rolling' }}
run: echo "ROSDEP_SKIP_KEYS=slam_toolbox" >> $GITHUB_ENV
run: echo "ROSDEP_SKIP_KEYS=slam_toolbox behaviortree-cpp octomap_server" >> $GITHUB_ENV
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
13 changes: 7 additions & 6 deletions grid_map_core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ project(grid_map_core)
find_package(ament_cmake REQUIRED)
find_package(grid_map_cmake_helpers REQUIRED)

## Define Eigen addons.
include(cmake/${PROJECT_NAME}-extras.cmake)

## System dependencies are found with CMake's conventions
find_package(Eigen3 REQUIRED)

Expand Down Expand Up @@ -44,6 +41,12 @@ target_include_directories(${PROJECT_NAME}

target_link_libraries(${PROJECT_NAME} PUBLIC Eigen3::Eigen)

target_compile_definitions(${PROJECT_NAME}
PUBLIC
EIGEN_DENSEBASE_PLUGIN="grid_map_core/eigen_plugins/DenseBasePlugin.hpp"
EIGEN_FUNCTORS_PLUGIN="grid_map_core/eigen_plugins/FunctorsPlugin.hpp"
)

#############
## Install ##
#############
Expand Down Expand Up @@ -127,6 +130,4 @@ endif()

ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
ament_export_dependencies(Eigen3)
ament_package(CONFIG_EXTRAS
cmake/${PROJECT_NAME}-extras.cmake
)
ament_package()
17 changes: 0 additions & 17 deletions grid_map_core/cmake/grid_map_core-extras.cmake

This file was deleted.

4 changes: 4 additions & 0 deletions tools/ros2_dependencies.repos
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
repositories:
BehaviorTree/BehaviorTree.CPP:
type: git
url: https://github.com/BehaviorTree/BehaviorTree.CPP.git
version: 4.6.2
ros-planning/navigation2:
type: git
url: https://github.com/ros-navigation/navigation2.git
Expand Down
Loading