| commit | 7ff8e047cedf2a33473092ab55c183b0bcf587c8 | [log] [tgz] |
|---|---|---|
| author | Ansgar Radermacher <ansgar.radermacher@cea.fr> | Wed Jul 01 13:57:24 2020 +0200 |
| committer | Ansgar Radermacher <ansgar.radermacher@cea.fr> | Wed Jul 01 17:44:46 2020 +0200 |
| tree | c21b58039bf1b34bce51db038aaa78c48788c69f | |
| parent | b530f75ba9143925fdb6c2e3f68f314b41decead [diff] |
Bug 560128 - [Robotics, ROS2] Add "Action" communication pattern, support its reversal. - Fix if condition in CMakeList generation - Update expected result Change-Id: I164235d3bbb595d4b41b7ea0c6b93e5f31c0fa84 Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/CMakeLists.txt b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/CMakeLists.txt index e401319..b75ffc6 100644 --- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/CMakeLists.txt +++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(rosidl_default_generators REQUIRED) -## Generate messages in the 'msg' folder +# Generate messages, services or actions rosidl_generate_interfaces( simple "msg/OccupancyGridMap.msg"
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/build/CreateMsgPkgCMakeLists.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/build/CreateMsgPkgCMakeLists.xtend index 02c8d08..f3703d2 100644 --- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/build/CreateMsgPkgCMakeLists.xtend +++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/build/CreateMsgPkgCMakeLists.xtend
@@ -50,10 +50,10 @@ «val msgFileNames = model.getMsgFileNames» «val srvFileNames = model.getSrvFileNames» «val actFileNames = model.getActFileNames» - «IF msgFileNames.size > 0 || srvFileNames.size > 0» + «IF msgFileNames.size > 0 || srvFileNames.size > 0 || actFileNames.size > 0» find_package(rosidl_default_generators REQUIRED) - ## Generate messages in the 'msg' folder + # Generate messages, services or actions rosidl_generate_interfaces( «model.pkgName» «FOR messageFN : msgFileNames»