Merge pull request #15 from wep21/fix/rolling

fix: include order for cpplint

Author: wxmerkt

.github/workflows/build_and_test.yml

@@ -25,7 +25,7 @@ jobs:
             ros_distribution: galactic
             ros_version: 2
           # Rolling Ridley  (June 2020 - Present)
-          - docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-rolling-ros-base-latest
+          - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
             ros_distribution: rolling
             ros_version: 2
     container:

CMakeLists.txt

@@ -12,11 +12,17 @@ endif()
 
 find_package(ament_cmake_auto REQUIRED)
 ament_auto_find_build_dependencies()
+find_package(OCTOMAP REQUIRED)
 
 ament_auto_add_library(${PROJECT_NAME} SHARED
   src/conversions.cpp
 )
 
+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${OCTOMAP_INCLUDE_DIRS}
+)
+
 if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()

include/octomap_ros/conversions.hpp

@@ -39,12 +39,13 @@
 
 #include <octomap/octomap.h>
 
-#include <geometry_msgs/msg/point.hpp>
-#include <sensor_msgs/msg/point_cloud2.hpp>
 #include <tf2/LinearMath/Quaternion.h>
 #include <tf2/LinearMath/Transform.h>
 #include <tf2/LinearMath/Vector3.h>
 
+#include <geometry_msgs/msg/point.hpp>
+#include <sensor_msgs/msg/point_cloud2.hpp>
+
 namespace octomap
 {
 /**

test/test_conversions.cpp

@@ -26,12 +26,12 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+#include <gtest/gtest.h>
+
 #include <sensor_msgs/point_cloud2_iterator.hpp>
 
 #include <octomap_ros/conversions.hpp>
 
-#include <gtest/gtest.h>
-
 constexpr double epsilon = 1e-6;
 
 TEST(conversions, pointOctomapToMsg)