Skip to content

Commit eae435d

Browse files
committed
fix unrecognized build type with catkin_make_isolated
order of statements is somehow revelant; catkin_make_isolated would not detect the build type; build farm jobs were failing; https://build.ros.org/job/Ndev__mqtt_client__ubuntu_focal_amd64/10/console
1 parent d9c11e4 commit eae435d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

mqtt_client/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<depend condition="$ROS_VERSION == 1">topic_tools</depend>
3737

3838
<export>
39-
<build_type condition="$ROS_VERSION == 2">ament_cmake</build_type>
4039
<build_type condition="$ROS_VERSION == 1">catkin</build_type>
40+
<build_type condition="$ROS_VERSION == 2">ament_cmake</build_type>
4141
<nodelet condition="$ROS_VERSION == 1" plugin="${prefix}/nodelet_plugins.xml" />
4242
</export>
4343

mqtt_client_interfaces/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<exec_depend condition="$ROS_VERSION == 1">message_runtime</exec_depend>
3030

3131
<export>
32-
<build_type condition="$ROS_VERSION == 2">ament_cmake</build_type>
3332
<build_type condition="$ROS_VERSION == 1">catkin</build_type>
33+
<build_type condition="$ROS_VERSION == 2">ament_cmake</build_type>
3434
</export>
3535

3636
<member_of_group condition="$ROS_VERSION == 2">rosidl_interface_packages</member_of_group>

0 commit comments

Comments
 (0)