Skip to content

fix include path (backport #781) (backport #790) #800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EugenioCollado merged 3 commits into from
Dec 9, 2025
Merged

fix include path (backport #781) (backport #790) #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
393a330
fix include path (#790)
mergify[bot] Dec 9, 2025
b70bebb
Compile service_msgs
EugenioCollado Dec 9, 2025
b6974cc
Compile unique_identifier_msgs
EugenioCollado Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions config/host/generic/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ set +o nounset
. install/local_setup.bash
set -o nounset

colcon build --packages-up-to service_msgs unique_identifier_msgs --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@

set +o nounset
. install/local_setup.bash
set -o nounset

colcon build --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@
14 changes: 14 additions & 0 deletions scripts/build_firmware.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,17 @@ else
. $PREFIX/config/$RTOS/$PLATFORM/build.sh
fi

######## Fix include paths ########
if [ "$RTOS" != "host" ]; then
cd "$FW_TARGETDIR/mcu_ws"
INCLUDE_ROS2_PACKAGES=$(colcon list | awk '{print $1}' | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}')

for var in ${INCLUDE_ROS2_PACKAGES}; do
if [ -d "$FW_TARGETDIR/build/include/${var}/${var}" ]; then
mkdir -p "$FW_TARGETDIR/build/include/${var}"
cp -a "$FW_TARGETDIR/build/include/${var}/${var}/". "$FW_TARGETDIR/build/include/${var}/"
rm -rf "$FW_TARGETDIR/build/include/${var}/${var}"
fi
done
fi

Loading