Merge branch 'main' into alvin/thruster_ctrl

StanfordASL · Jan 16, 2024 · 94bf121 · 94bf121
2 parents c4c455a + 8d1e8ed
commit 94bf121
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ff_estimate/CMakeLists.txt b/ff_estimate/CMakeLists.txt
@@ -7,6 +7,8 @@ endif()
 
 # find dependencies
 find_package(ament_cmake REQUIRED)
+find_package(eigen3_cmake_module REQUIRED)
+find_package(Eigen3)
 find_package(geometry_msgs REQUIRED)
 find_package(rclcpp REQUIRED)
 
@@ -18,10 +20,10 @@ target_include_directories(est_lib PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>)
 target_compile_features(est_lib PUBLIC cxx_std_17)
-ament_target_dependencies(est_lib rclcpp ff_msgs geometry_msgs)
+ament_target_dependencies(est_lib rclcpp ff_msgs geometry_msgs Eigen3)
 
 ament_export_targets(est_libTarget HAS_LIBRARY_TARGET)
-ament_export_dependencies(rclcpp ff_msgs)
+ament_export_dependencies(rclcpp ff_msgs Eigen3 eigen3_cmake_module)
 
 install(
   DIRECTORY include/

diff --git a/ff_estimate/package.xml b/ff_estimate/package.xml
@@ -8,6 +8,9 @@
   <license>TODO: License declaration</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>eigen3_cmake_module</buildtool_depend>
+
+  <build_depend>eigen</build_depend>
 
   <depend>rclcpp</depend>
   <depend>geometry_msgs</depend>
@@ -16,6 +19,9 @@
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
 
+  <buildtool_export_depend>eigen3_cmake_module</buildtool_export_depend>
+  <build_export_depend>eigen</build_export_depend>
+
   <export>
     <build_type>ament_cmake</build_type>
   </export>