Skip to content

Commit 4941b7a

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) # Conflicts: # scripts/create_firmware_ws.sh
1 parent 526d0c5 commit 4941b7a

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,13 @@ popd >/dev/null
102102
. $(dirname $0)/clean_env.sh
103103
if [ $RTOS != "host" ]; then
104104
pushd $FW_TARGETDIR/$DEV_WS_DIR >/dev/null
105+
<<<<<<< HEAD
106+
=======
107+
# Fix failing build by ignoring rmw_test_fixture_implementation.
108+
touch ros2/ament_cmake_ros/rmw_test_fixture_implementation/COLCON_IGNORE
109+
# Fix failing build by ignoring rmw_test_fixture.
110+
touch ros2/ament_cmake_ros/rmw_test_fixture/COLCON_IGNORE
111+
>>>>>>> 1662e44 (Fix ament_cmake dependency (#795))
105112
colcon build
106113
set +o nounset
107114
# source dev workspace
@@ -114,4 +121,3 @@ rosdep install --os=ubuntu:noble -y --from-paths $PREFIX/config/$RTOS/$TARGET_FO
114121

115122
# Creating specific firmware folder
116123
. $PREFIX/config/$RTOS/$TARGET_FOLDER/create.sh
117-

0 commit comments

Comments
 (0)