Merge pull request #13 from PepperlFuchs/feature/ros2-jazzy-adaption

adjustments so that the driver can also be built and run with ros2 humble and jazzy
PepperlFuchs · Sep 17, 2024 · cf5346e · cf5346e
2 parents c4ba7b5 + 06c283d
commit cf5346e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/pf_driver/CMakeLists.txt b/src/pf_driver/CMakeLists.txt
@@ -1,8 +1,10 @@
 cmake_minimum_required(VERSION 3.7)
 project(pf_driver)
 
-find_package(ament_cmake REQUIRED)
+set(CMAKE_POLICY_DEFAULT_CMP0144 OLD)
 
+find_package(ament_cmake REQUIRED)
+find_package(ament_index_cpp REQUIRED)
 find_package(pf_interfaces)
 find_package(laser_geometry REQUIRED)
 find_package(pcl_conversions REQUIRED)
@@ -12,7 +14,6 @@ find_package(sensor_msgs REQUIRED)
 find_package(std_msgs REQUIRED)
 find_package(tf2_ros REQUIRED)
 find_package(pf_interfaces REQUIRED)
-
 find_package(Boost REQUIRED COMPONENTS  thread system)
 if(NOT TARGET JsonCpp::JsonCpp)
   find_package(jsoncpp REQUIRED)
@@ -58,12 +59,15 @@ add_executable(ros_main
   ${${PROJECT_NAME}_SOURCES}
   src/ros/ros_main.cpp
 )
+
 target_link_libraries(ros_main
+  ament_index_cpp::ament_index_cpp
   curlpp
   curl
   jsoncpp
   yaml-cpp
 )
+
 ament_target_dependencies(ros_main
   rclcpp
   pf_interfaces
@@ -99,6 +103,7 @@ if (BUILD_TESTING)
     $<INSTALL_INTERFACE:include>
   )
   target_link_libraries(${PROJECT_NAME}_test
+    ament_index_cpp::ament_index_cpp
     curlpp
     curl
     jsoncpp

diff --git a/src/pf_driver/include/pf_driver/pf/parser_utils.h b/src/pf_driver/include/pf_driver/pf/parser_utils.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <string>
 #include <vector>
 

diff --git a/src/pf_driver/include/pf_driver/pf/pfsdp_base.h b/src/pf_driver/include/pf_driver/pf/pfsdp_base.h
@@ -14,9 +14,10 @@
 
 #pragma once
 
-#include <mutex>
-#include <memory>
+#include <cstdint>
 #include <functional>
+#include <memory>
+#include <mutex>
 
 #include <rclcpp/node.hpp>
 #include <boost/algorithm/string.hpp>