fix ci

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
ros-controls · Feb 14, 2023 · 97d021b · 97d021b
1 parent 80b37c5
commit 97d021b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/gz_ros2_control/CMakeLists.txt b/gz_ros2_control/CMakeLists.txt
@@ -46,6 +46,10 @@ else()
   add_definitions(-DGZ_HEADERS)
 endif()
 
+if("$ENV{ROS_DISTRO}" STREQUAL "rolling")
+  add_definitions(-DROLLING)
+endif()
+
 include_directories(include)
 
 add_library(${PROJECT_NAME}-system SHARED

diff --git a/gz_ros2_control/src/gz_ros2_control_plugin.cpp b/gz_ros2_control/src/gz_ros2_control_plugin.cpp
@@ -403,7 +403,7 @@ void GazeboSimROS2ControlPlugin::Configure(
   }
 
   for (unsigned int i = 0; i < control_hardware_info.size(); ++i) {
-#ifdef GZ_HEADERS
+#ifndef ROLLING
     std::string robot_hw_sim_type_str_ = control_hardware_info[i].hardware_class_type;
 #else
     std::string robot_hw_sim_type_str_ = control_hardware_info[i].hardware_plugin_name;