From 98483bcf3b68174c30c659b34197e32be7cb76b4 Mon Sep 17 00:00:00 2001 From: VictorLee Date: Tue, 15 Mar 2022 15:02:26 +0800 Subject: [PATCH 1/2] build dynamic lib of rosidl_typesupport of (#473) microxrcedds_c (cherry picked from commit 3136ad07d98cc4b50badfc57620325b5dc2b55eb) # Conflicts: # config/host/generic/client_host_packages.repos --- config/host/generic/build.sh | 6 +++--- config/host/generic/client_host_packages.repos | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/host/generic/build.sh b/config/host/generic/build.sh index 62fccf03..31d497db 100755 --- a/config/host/generic/build.sh +++ b/config/host/generic/build.sh @@ -1,9 +1,9 @@ #!/bin/bash -colcon build --packages-up-to rosidl_typesupport_microxrcedds_c --metas src --cmake-args -DBUILD_TESTING=OFF $@ -colcon build --packages-up-to rosidl_typesupport_microxrcedds_cpp --metas src --cmake-args -DBUILD_TESTING=OFF $@ +colcon build --packages-up-to rosidl_typesupport_microxrcedds_c --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ +colcon build --packages-up-to rosidl_typesupport_microxrcedds_cpp --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 $@ +colcon build --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ diff --git a/config/host/generic/client_host_packages.repos b/config/host/generic/client_host_packages.repos index 6a513446..c0b11568 100644 --- a/config/host/generic/client_host_packages.repos +++ b/config/host/generic/client_host_packages.repos @@ -33,7 +33,11 @@ repositories: uros/micro_ros_utilities: type: git url: https://github.com/micro-ROS/micro_ros_utilities +<<<<<<< HEAD version: main +======= + version: galactic +>>>>>>> 3136ad0 (build dynamic lib of rosidl_typesupport of (#473)) # Required messages packages From 3d7b856366083bff34733ce10a74f5e901992dff Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Tue, 15 Mar 2022 08:05:05 +0100 Subject: [PATCH 2/2] Conflicts Signed-off-by: Pablo Garrido --- config/host/generic/client_host_packages.repos | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/host/generic/client_host_packages.repos b/config/host/generic/client_host_packages.repos index c0b11568..6a513446 100644 --- a/config/host/generic/client_host_packages.repos +++ b/config/host/generic/client_host_packages.repos @@ -33,11 +33,7 @@ repositories: uros/micro_ros_utilities: type: git url: https://github.com/micro-ROS/micro_ros_utilities -<<<<<<< HEAD version: main -======= - version: galactic ->>>>>>> 3136ad0 (build dynamic lib of rosidl_typesupport of (#473)) # Required messages packages