From e534f498023c3f9b0fd1add0e467c5146e21e60b Mon Sep 17 00:00:00 2001 From: Tim Clephas Date: Mon, 30 Mar 2026 08:47:47 +0200 Subject: [PATCH 1/2] Unvendor gtest --- patch/dependencies.yaml | 3 +++ pkg_additional_info.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml index 4320cd4a8..1c0f76b18 100644 --- a/patch/dependencies.yaml +++ b/patch/dependencies.yaml @@ -172,6 +172,9 @@ uncrustify_vendor: add_run: ["uncrustify"] mimick_vendor: add_build: ["vcstool"] +gtest_vendor: + add_host: ["gtest"] + add_run: ["gtest"] gz_cmake_vendor: # https://github.com/gazebo-release/gz_cmake_vendor/blob/kilted/CMakeLists.txt#L6 for select the right major version # (this is true for all gz-* vendor packages) or https://github.com/gazebo-tooling/gazebodistro/blob/master/collection-harmonic.yaml diff --git a/pkg_additional_info.yaml b/pkg_additional_info.yaml index bca1a2503..c4798f1d5 100644 --- a/pkg_additional_info.yaml +++ b/pkg_additional_info.yaml @@ -69,6 +69,8 @@ librealsense2: max_pin: 'x.x' libcurl_vendor: additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK" +gtest_vendor: + additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK" gz_cmake_vendor: additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK" gz_common_vendor: From fa366893265ffed199092302e2677ad93e0dfbd2 Mon Sep 17 00:00:00 2001 From: Tim Clephas Date: Mon, 30 Mar 2026 22:58:48 +0200 Subject: [PATCH 2/2] Add build number Co-authored-by: Tobias Fischer --- pkg_additional_info.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg_additional_info.yaml b/pkg_additional_info.yaml index c4798f1d5..f214c3789 100644 --- a/pkg_additional_info.yaml +++ b/pkg_additional_info.yaml @@ -71,6 +71,7 @@ libcurl_vendor: additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK" gtest_vendor: additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK" + build_number: 16 gz_cmake_vendor: additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK" gz_common_vendor: