From 144c65c92fb6e09e266f192e58effc15a2c7d2a6 Mon Sep 17 00:00:00 2001 From: TSC21 Date: Fri, 3 Apr 2020 17:29:52 +0100 Subject: [PATCH] microRTPS: only use '-typeros2' FastRTPSGen option for Dashing and later ROS2 distros --- msg/tools/generate_microRTPS_bridge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msg/tools/generate_microRTPS_bridge.py b/msg/tools/generate_microRTPS_bridge.py index 73c44e1c5e..67a79354e3 100644 --- a/msg/tools/generate_microRTPS_bridge.py +++ b/msg/tools/generate_microRTPS_bridge.py @@ -423,7 +423,7 @@ def generate_agent(out_dir): # the '-typeros2' option in fastrtpsgen. # .. note:: This is only available in FastRTPSGen 1.0.4 and above gen_ros2_typename = "" - if ros2_distro and fastrtpsgen_version >= version.Version("1.0.4"): + if ros2_distro and ros2_distro in ['dashing', 'eloquent', 'foxy'] and fastrtpsgen_version >= version.Version("1.0.4"): gen_ros2_typename = "-typeros2 " for idl_file in glob.glob(os.path.join(idl_dir, "*.idl")):