switch to use tf2_eigen.hpp, but that drops support for EOL distros

mavlink · Sep 9, 2023 · 5f8c492 · 5f8c492
1 parent 4d4eff1
commit 5f8c492
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 24 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,9 +11,9 @@ jobs:
       matrix:
         env:
           # - {ROS_DISTRO: foxy, ROS_REPO: testing}
-          - {ROS_DISTRO: foxy, ROS_REPO: main}
+          # - {ROS_DISTRO: foxy, ROS_REPO: main}
           # - {ROS_DISTRO: galactic, ROS_REPO: testing}
-          - {ROS_DISTRO: galactic, ROS_REPO: main}
+          # - {ROS_DISTRO: galactic, ROS_REPO: main}
           - {ROS_DISTRO: humble, ROS_REPO: main}
           - {ROS_DISTRO: iron, ROS_REPO: main}
           - {ROS_DISTRO: rolling, ROS_REPO: testing}

diff --git a/mavros/CMakeLists.txt b/mavros/CMakeLists.txt
@@ -3,7 +3,7 @@ project(mavros)
 
 # Default to C++20
 if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD 20)
   #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++2a")
 endif()
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")

diff --git a/mavros_extras/src/plugins/camera.cpp b/mavros_extras/src/plugins/camera.cpp
@@ -14,8 +14,7 @@
  * @{
  */
 
-#include <tf2_eigen/tf2_eigen.h>
-
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/plugin.hpp"

diff --git a/mavros_extras/src/plugins/distance_sensor.cpp b/mavros_extras/src/plugins/distance_sensor.cpp
@@ -16,14 +16,14 @@
  */
 
 #include <yaml-cpp/yaml.h>
-#include <tf2_eigen/tf2_eigen.h>
 
 #include <unordered_map>
 #include <string>
 #include <memory>
 #include <vector>
 #include <shared_mutex>     // NOLINT cpplint, that is almost 4 years since standard release!
 
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/plugin.hpp"

diff --git a/mavros_extras/src/plugins/guided_target.cpp b/mavros_extras/src/plugins/guided_target.cpp
@@ -14,12 +14,11 @@
  * @{
  */
 
-#include <tf2_eigen/tf2_eigen.h>
-
 #include <string>
 
 #include <GeographicLib/Geocentric.hpp>
 
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/plugin.hpp"

diff --git a/mavros_extras/src/plugins/hil.cpp b/mavros_extras/src/plugins/hil.cpp
@@ -17,10 +17,9 @@
  * @{
  */
 
-#include <tf2_eigen/tf2_eigen.h>
-
 #include <algorithm>
 
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/plugin.hpp"

diff --git a/mavros_extras/src/plugins/landing_target.cpp b/mavros_extras/src/plugins/landing_target.cpp
@@ -14,11 +14,10 @@
  * https://github.com/mavlink/mavros/tree/master/LICENSE.md
  */
 
-#include <tf2_eigen/tf2_eigen.h>
-
 #include <algorithm>
 #include <string>
 
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/utils.hpp"

diff --git a/mavros_extras/src/plugins/mocap_pose_estimate.cpp b/mavros_extras/src/plugins/mocap_pose_estimate.cpp
@@ -15,8 +15,7 @@
  * @{
  */
 
-#include <tf2_eigen/tf2_eigen.h>
-
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/plugin.hpp"

diff --git a/mavros_extras/src/plugins/mount_control.cpp b/mavros_extras/src/plugins/mount_control.cpp
@@ -16,10 +16,9 @@
  * @{
  */
 
-#include <tf2_eigen/tf2_eigen.h>
-
 #include <memory>
 
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/plugin.hpp"

diff --git a/mavros_extras/src/plugins/odom.cpp b/mavros_extras/src/plugins/odom.cpp
@@ -16,10 +16,9 @@
  * @{
  */
 
-#include <tf2_eigen/tf2_eigen.h>
-
 #include <string>
 
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/plugin.hpp"

diff --git a/mavros_extras/src/plugins/vibration.cpp b/mavros_extras/src/plugins/vibration.cpp
@@ -14,10 +14,9 @@
  * @{
  */
 
-#include <tf2_eigen/tf2_eigen.h>
-
 #include <string>
 
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/plugin.hpp"

diff --git a/mavros_extras/src/plugins/vision_pose_estimate.cpp b/mavros_extras/src/plugins/vision_pose_estimate.cpp
@@ -15,10 +15,9 @@
  * @{
  */
 
-#include <tf2_eigen/tf2_eigen.h>
-
 #include <string>
 
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/utils.hpp"

diff --git a/mavros_extras/src/plugins/wheel_odometry.cpp b/mavros_extras/src/plugins/wheel_odometry.cpp
@@ -14,12 +14,11 @@
  * @{
  */
 
-#include <tf2_eigen/tf2_eigen.h>
-
 #include <algorithm>
 #include <string>
 #include <vector>
 
+#include "tf2_eigen/tf2_eigen.hpp"
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/plugin.hpp"