From 4484d53f4b5be96b9778c5dfa33da8fb87c49e42 Mon Sep 17 00:00:00 2001 From: Victor Derks Date: Sun, 20 Sep 2026 18:00:55 +0200 Subject: [PATCH] gtest: update from 1.17.0 to 1.18.0 --- releases.json | 1 + subprojects/gtest.wrap | 13 +++++-------- .../packagefiles/gtest/googlemock/meson.build | 3 +++ .../packagefiles/gtest/googletest/meson.build | 3 +++ subprojects/packagefiles/gtest/meson.build | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/releases.json b/releases.json index 0c453e5a2b..8fb5acb9d6 100644 --- a/releases.json +++ b/releases.json @@ -1622,6 +1622,7 @@ "gmock_main" ], "versions": [ + "1.18.0-1", "1.17.0-4", "1.17.0-3", "1.17.0-2", diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap index 61faeb5520..5b640b0948 100644 --- a/subprojects/gtest.wrap +++ b/subprojects/gtest.wrap @@ -1,12 +1,9 @@ [wrap-file] -directory = googletest-1.17.0 -source_url = https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz -source_filename = googletest-1.17.0.tar.gz -source_hash = 65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c +directory = googletest-1.18.0 +source_url = https://github.com/google/googletest/archive/refs/tags/v1.18.0.tar.gz +source_filename = googletest-1.18.0.tar.gz +source_hash = 6e3191c1455468b3fc35a417fb565c1c5071aee1b7e7f85e30cf48a98d37d8b5 patch_directory = gtest [provide] -gtest = gtest_dep -gtest_main = gtest_main_dep -gmock = gmock_dep -gmock_main = gmock_main_dep +dependency_names = gtest, gmock, gtest_main, gmock_main diff --git a/subprojects/packagefiles/gtest/googlemock/meson.build b/subprojects/packagefiles/gtest/googlemock/meson.build index 4e198082dc..71297165b9 100644 --- a/subprojects/packagefiles/gtest/googlemock/meson.build +++ b/subprojects/packagefiles/gtest/googlemock/meson.build @@ -80,3 +80,6 @@ else dependencies: gmock_dep, ) endif + +meson.override_dependency('gmock', gmock_dep) +meson.override_dependency('gmock_main', gmock_main_dep) diff --git a/subprojects/packagefiles/gtest/googletest/meson.build b/subprojects/packagefiles/gtest/googletest/meson.build index 3fcdd8a7cf..d28e379fe9 100644 --- a/subprojects/packagefiles/gtest/googletest/meson.build +++ b/subprojects/packagefiles/gtest/googletest/meson.build @@ -52,3 +52,6 @@ gtest_main_dep = declare_dependency( link_with: gtest_main_lib, dependencies: gtest_dep, ) + +meson.override_dependency('gtest', gtest_dep) +meson.override_dependency('gtest_main', gtest_main_dep) diff --git a/subprojects/packagefiles/gtest/meson.build b/subprojects/packagefiles/gtest/meson.build index 39f58df47c..4f37f4d939 100644 --- a/subprojects/packagefiles/gtest/meson.build +++ b/subprojects/packagefiles/gtest/meson.build @@ -1,8 +1,8 @@ project( 'gtest', 'cpp', - version: '1.17.0', - meson_version: '>=0.49.0', + version: '1.18.0', + meson_version: '>=0.56.0', license: 'BSD-3-Clause', )