[gtest] update to 1.12.0 (microsoft#25410)

SupSuper · Jun 24, 2022 · 23f346e · 23f346e
1 parent 9cece28
commit 23f346e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 27 deletions.
diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake
@@ -5,13 +5,12 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/googletest
-    REF release-1.11.0
-    SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
+    REF release-1.12.0
+    SHA512 6216e76a8c988b6b3739f3988c85f369eef2a8036c4412621a0d3d04ceeada00d35e487363be0a265035ac78f1a5065e1fe054a285c43df23b6abcc69f8bfe3d
     HEAD_REF main
     PATCHES
         clang-tidy-no-lint.patch
         fix-main-lib-path.patch
-        remove-werror.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT)
@@ -31,6 +30,7 @@ file(
         "${SOURCE_PATH}/googletest/src/gtest.cc"
         "${SOURCE_PATH}/googletest/src/gtest_main.cc"
         "${SOURCE_PATH}/googletest/src/gtest-all.cc"
+        "${SOURCE_PATH}/googletest/src/gtest-assertion-result.cc"
         "${SOURCE_PATH}/googletest/src/gtest-death-test.cc"
         "${SOURCE_PATH}/googletest/src/gtest-filepath.cc"
         "${SOURCE_PATH}/googletest/src/gtest-internal-inl.h"

diff --git a/ports/gtest/remove-werror.patch b/ports/gtest/remove-werror.patch
diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gtest",
-  "version-semver": "1.11.0",
-  "port-version": 5,
+  "version-semver": "1.12.0",
   "description": "GoogleTest and GoogleMock testing frameworks",
   "homepage": "https://github.com/google/googletest",
   "license": "BSD-3-Clause",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2701,8 +2701,8 @@
       "port-version": 5
     },
     "gtest": {
-      "baseline": "1.11.0",
-      "port-version": 5
+      "baseline": "1.12.0",
+      "port-version": 0
     },
     "gtk": {
       "baseline": "4.6.2",

diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "da295db55242fd454a3b42486c3f9043356ca40f",
+      "version-semver": "1.12.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9731f44f8b0ecbc67eafccd0440700357d2cdfc4",
       "version-semver": "1.11.0",