Update devel to build on Ubuntu Jammy (22.04) (#326)

* Update to C++17 for use with Ubuntu Jammy * Include Rviz and Eigen as system includes, which supresses warnings within the included libraries * use pluginlib and class_list_macros .hpp include instead of deprecated .h From: Lucas Walter <[email protected]>
locusrobotics · May 12, 2023 · 31e8310 · 31e8310
1 parent f6c4c2f
commit 31e8310
Show file tree

Hide file tree

Showing 72 changed files with 150 additions and 147 deletions.
diff --git a/fuse_constraints/CMakeLists.txt b/fuse_constraints/CMakeLists.txt
@@ -78,7 +78,7 @@ target_link_libraries(${PROJECT_NAME}
 )
 set_target_properties(${PROJECT_NAME}
   PROPERTIES
-    CXX_STANDARD 14
+    CXX_STANDARD 17
     CXX_STANDARD_REQUIRED YES
 )
 
@@ -135,7 +135,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_absolute_constraint
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -161,7 +161,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_absolute_orientation_3d_stamped_constraint
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -187,7 +187,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_absolute_orientation_3d_stamped_euler_constraint
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -211,7 +211,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_absolute_pose_2d_stamped_constraint
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -235,7 +235,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_absolute_pose_3d_stamped_constraint
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -257,7 +257,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_marginal_constraint
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -280,7 +280,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_marginalize_variables
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -304,7 +304,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_normal_delta_pose_2d
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -328,7 +328,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_normal_prior_pose_2d
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -352,7 +352,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_relative_constraint
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -376,7 +376,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_relative_pose_2d_stamped_constraint
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -400,7 +400,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_relative_pose_3d_stamped_constraint
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -419,7 +419,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_uuid_ordering
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -436,7 +436,7 @@ if(CATKIN_ENABLE_TESTING)
   )
   set_target_properties(test_variable_constraints
     PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
   )
 
@@ -458,7 +458,7 @@ if(CATKIN_ENABLE_TESTING)
       )
       set_target_properties(benchmark_normal_delta_pose_2d
         PROPERTIES
-          CXX_STANDARD 14
+          CXX_STANDARD 17
           CXX_STANDARD_REQUIRED YES
       )
     endif()
@@ -477,7 +477,7 @@ if(CATKIN_ENABLE_TESTING)
       )
       set_target_properties(benchmark_normal_prior_pose_2d
         PROPERTIES
-          CXX_STANDARD 14
+          CXX_STANDARD 17
           CXX_STANDARD_REQUIRED YES
       )
     endif()

diff --git a/fuse_constraints/src/absolute_constraint.cpp b/fuse_constraints/src/absolute_constraint.cpp
@@ -33,7 +33,7 @@
  */
 #include <fuse_constraints/absolute_constraint.h>
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 #include <boost/serialization/export.hpp>
 

diff --git a/fuse_constraints/src/absolute_orientation_3d_stamped_constraint.cpp b/fuse_constraints/src/absolute_orientation_3d_stamped_constraint.cpp
@@ -34,7 +34,7 @@
 #include <fuse_constraints/absolute_orientation_3d_stamped_constraint.h>
 
 #include <fuse_constraints/normal_prior_orientation_3d_cost_functor.h>
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 #include <boost/serialization/export.hpp>
 #include <ceres/autodiff_cost_function.h>

diff --git a/fuse_constraints/src/absolute_orientation_3d_stamped_euler_constraint.cpp b/fuse_constraints/src/absolute_orientation_3d_stamped_euler_constraint.cpp
@@ -34,7 +34,7 @@
 #include <fuse_constraints/absolute_orientation_3d_stamped_euler_constraint.h>
 
 #include <fuse_constraints/normal_prior_orientation_3d_euler_cost_functor.h>
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 #include <boost/serialization/export.hpp>
 #include <ceres/autodiff_cost_function.h>

diff --git a/fuse_constraints/src/absolute_pose_2d_stamped_constraint.cpp b/fuse_constraints/src/absolute_pose_2d_stamped_constraint.cpp
@@ -34,7 +34,7 @@
 #include <fuse_constraints/absolute_pose_2d_stamped_constraint.h>
 
 #include <fuse_constraints/normal_prior_pose_2d.h>
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 #include <boost/serialization/export.hpp>
 #include <ceres/autodiff_cost_function.h>

diff --git a/fuse_constraints/src/absolute_pose_3d_stamped_constraint.cpp b/fuse_constraints/src/absolute_pose_3d_stamped_constraint.cpp
@@ -34,7 +34,7 @@
 #include <fuse_constraints/absolute_pose_3d_stamped_constraint.h>
 
 #include <fuse_constraints/normal_prior_pose_3d_cost_functor.h>
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 #include <boost/serialization/export.hpp>
 #include <ceres/autodiff_cost_function.h>

diff --git a/fuse_constraints/src/marginal_constraint.cpp b/fuse_constraints/src/marginal_constraint.cpp
@@ -35,7 +35,7 @@
 
 #include <fuse_constraints/marginal_cost_function.h>
 #include <fuse_core/constraint.h>
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 #include <boost/serialization/export.hpp>
 #include <Eigen/Core>

diff --git a/fuse_constraints/src/relative_constraint.cpp b/fuse_constraints/src/relative_constraint.cpp
@@ -33,7 +33,7 @@
  */
 #include <fuse_constraints/relative_constraint.h>
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 #include <boost/serialization/export.hpp>
 

diff --git a/fuse_constraints/src/relative_orientation_3d_stamped_constraint.cpp b/fuse_constraints/src/relative_orientation_3d_stamped_constraint.cpp
@@ -34,7 +34,7 @@
 #include <fuse_constraints/relative_orientation_3d_stamped_constraint.h>
 
 #include <fuse_constraints/normal_delta_orientation_3d_cost_functor.h>
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 #include <boost/serialization/export.hpp>
 #include <ceres/autodiff_cost_function.h>

diff --git a/fuse_constraints/src/relative_pose_2d_stamped_constraint.cpp b/fuse_constraints/src/relative_pose_2d_stamped_constraint.cpp
@@ -34,7 +34,7 @@
 #include <fuse_constraints/relative_pose_2d_stamped_constraint.h>
 
 #include <fuse_constraints/normal_delta_pose_2d.h>
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 #include <boost/serialization/export.hpp>
 #include <ceres/autodiff_cost_function.h>

diff --git a/fuse_constraints/src/relative_pose_3d_stamped_constraint.cpp b/fuse_constraints/src/relative_pose_3d_stamped_constraint.cpp
@@ -34,7 +34,7 @@
 #include <fuse_constraints/relative_pose_3d_stamped_constraint.h>
 
 #include <fuse_constraints/normal_delta_pose_3d_cost_functor.h>
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 #include <boost/serialization/export.hpp>
 #include <ceres/autodiff_cost_function.h>