From 8b92da06aa3e9081e6fec1fa912341100e99b3fa Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Fri, 14 Nov 2025 03:35:20 -0500 Subject: [PATCH 1/2] Change colcon.pkg dependencies to be test-dependencies (#293) The dependencies on ament_cmake, ament_cmake_gtest, and googletest-distribution are only needed when building for tests, so we should only inject them as test dependencies. Signed-off-by: Chris Lalancette (cherry picked from commit 88eb2ab7a3aee8b68213b21d60d009ff1752a3a3) # Conflicts: # colcon.pkg --- colcon.pkg | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/colcon.pkg b/colcon.pkg index 4b658ba5..cdda1ee7 100644 --- a/colcon.pkg +++ b/colcon.pkg @@ -1,5 +1,16 @@ +<<<<<<< HEAD { "name": "fastcdr", "type": "cmake", "dependencies" : ["googletest-distribution"] } +======= +name: fastcdr +type: cmake +test-dependencies: + # Needed for test compilation in ROS 2 CI + - ament_cmake_gtest + - ament_cmake + # Needed for test compilation in eProsima CI + - googletest-distribution +>>>>>>> 88eb2ab (Change colcon.pkg dependencies to be test-dependencies (#293)) From f11b7276ca1ffeb94be038027eed1052edc6f5db Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Fri, 14 Nov 2025 09:39:52 +0100 Subject: [PATCH 2/2] Fix conflicts Signed-off-by: Miguel Company --- colcon.pkg | 8 -------- 1 file changed, 8 deletions(-) diff --git a/colcon.pkg b/colcon.pkg index cdda1ee7..b1021816 100644 --- a/colcon.pkg +++ b/colcon.pkg @@ -1,10 +1,3 @@ -<<<<<<< HEAD -{ - "name": "fastcdr", - "type": "cmake", - "dependencies" : ["googletest-distribution"] -} -======= name: fastcdr type: cmake test-dependencies: @@ -13,4 +6,3 @@ test-dependencies: - ament_cmake # Needed for test compilation in eProsima CI - googletest-distribution ->>>>>>> 88eb2ab (Change colcon.pkg dependencies to be test-dependencies (#293))