Skip to content

Commit 86c8569

Browse files
committed
Fix eigen plugins compile definition
1 parent c313843 commit 86c8569

File tree

2 files changed

+7
-23
lines changed

2 files changed

+7
-23
lines changed

grid_map_core/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ project(grid_map_core)
55
find_package(ament_cmake REQUIRED)
66
find_package(grid_map_cmake_helpers REQUIRED)
77

8-
## Define Eigen addons.
9-
include(cmake/${PROJECT_NAME}-extras.cmake)
10-
118
## System dependencies are found with CMake's conventions
129
find_package(Eigen3 REQUIRED)
1310

@@ -44,6 +41,12 @@ target_include_directories(${PROJECT_NAME}
4441

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

44+
target_compile_definitions(${PROJECT_NAME}
45+
PUBLIC
46+
EIGEN_DENSEBASE_PLUGIN="grid_map_core/eigen_plugins/DenseBasePlugin.hpp"
47+
EIGEN_FUNCTORS_PLUGIN="grid_map_core/eigen_plugins/FunctorsPlugin.hpp"
48+
)
49+
4750
#############
4851
## Install ##
4952
#############
@@ -127,6 +130,4 @@ endif()
127130

128131
ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
129132
ament_export_dependencies(Eigen3)
130-
ament_package(CONFIG_EXTRAS
131-
cmake/${PROJECT_NAME}-extras.cmake
132-
)
133+
ament_package()

grid_map_core/cmake/grid_map_core-extras.cmake

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)