Skip to content

Commit 29cd959

Browse files
Carlosespicurmergify[bot]
authored andcommitted
Fix ament_cmake dependency (#795)
* Fix ament_cmake dependency Signed-off-by: Carlosespicur <carlosespicur@proton.me> * Ignore rmw_test_fixture package Signed-off-by: Carlosespicur <carlosespicur@proton.me> * Add ament_lint_auto dependency Signed-off-by: Carlosespicur <carlosespicur@proton.me> --------- Signed-off-by: Carlosespicur <carlosespicur@proton.me> (cherry picked from commit 1662e44)
1 parent 450f62d commit 29cd959

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<depend>python3-yaml</depend>
1313
<depend>clang-tidy</depend>
1414

15+
<buildtool_depend>ament_cmake</buildtool_depend>
16+
<buildtool_depend>ament_lint_auto</buildtool_depend>
1517
<build_depend>flex</build_depend>
1618
<build_depend>bison</build_depend>
1719
<build_depend>libncurses-dev</build_depend>

scripts/create_firmware_ws.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ if [ $RTOS != "host" ]; then
104104
pushd $FW_TARGETDIR/$DEV_WS_DIR >/dev/null
105105
# Fix failing build by ignoring rmw_test_fixture_implementation.
106106
touch ros2/ament_cmake_ros/rmw_test_fixture_implementation/COLCON_IGNORE
107+
# Fix failing build by ignoring rmw_test_fixture.
108+
touch ros2/ament_cmake_ros/rmw_test_fixture/COLCON_IGNORE
107109
colcon build
108110
set +o nounset
109111
# source dev workspace
@@ -116,4 +118,3 @@ rosdep install --os=ubuntu:noble -y --from-paths $PREFIX/config/$RTOS/$TARGET_FO
116118

117119
# Creating specific firmware folder
118120
. $PREFIX/config/$RTOS/$TARGET_FOLDER/create.sh
119-

0 commit comments

Comments
 (0)