[gtest] Update to the latest commit (#17709)

* [gtest] Update to the latest commit

* update version

* update version-date

* update version

* modify version notes

* update version

8 files changed, 24 insertions, 55 deletions

diff --git a/ports/gtest/0002-Fix-z7-override.patch b/ports/gtest/0002-Fix-z7-override.patch
deleted file mode 100644
index cf875084c..000000000
--- a/ports/gtest/0002-Fix-z7-override.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
-index 99725b7..3c25b0a 100644
---- a/googletest/cmake/internal_utils.cmake
-+++ b/googletest/cmake/internal_utils.cmake
-@@ -66,7 +66,7 @@ macro(config_compiler_and_linker)
-   if (MSVC)
-     # Newlines inside flags variables break CMake's NMake generator.
-     # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
--    set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi")
-+    set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J")
-     set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
-     set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
-     set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL
deleted file mode 100644
index c0f5bb9d4..000000000
--- a/ports/gtest/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: gtest
-Version: 1.10.0
-Port-Version: 4
-Homepage: https://github.com/google/googletest
-Description: GoogleTest and GoogleMock testing frameworks.
diff --git a/ports/gtest/fix-build-failure-in-gcc-11.patch b/ports/gtest/fix-build-failure-in-gcc-11.patch
deleted file mode 100644
index b0369892e..000000000
--- a/ports/gtest/fix-build-failure-in-gcc-11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
-index da09a1cf..43cbd78a 100644
---- a/googletest/src/gtest-death-test.cc
-+++ b/googletest/src/gtest-death-test.cc
-@@ -1288,7 +1288,7 @@ static void StackLowerThanAddress(const void* ptr,
- // making comparison result unpredictable.
- GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
- static void StackLowerThanAddress(const void* ptr, bool* result) {
--  int dummy;
-+  int dummy = 0;
-   *result = (&dummy < ptr);
- }
- 
-@@ -1296,7 +1296,7 @@ static void StackLowerThanAddress(const void* ptr, bool* result) {
- GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
- GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
- static bool StackGrowsDown() {
--  int dummy;
-+  int dummy = 0;
-   bool result;
-   StackLowerThanAddress(&dummy, &result);
-   return result;
diff --git a/ports/gtest/fix-main-lib-path.patch b/ports/gtest/fix-main-lib-path.patch
index e07806eec..8b4349f7f 100644
--- a/ports/gtest/fix-main-lib-path.patch
+++ b/ports/gtest/fix-main-lib-path.patch
@@ -1,8 +1,8 @@
 diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
-index 3e72d75..9d135ff 100644
+index e7df8ec..1ecd596 100644
 --- a/googlemock/CMakeLists.txt
 +++ b/googlemock/CMakeLists.txt
-@@ -115,7 +115,8 @@ endif()
+@@ -120,7 +120,8 @@ endif()
  ########################################################################
  #
  # Install rules
@@ -13,10 +13,10 @@ index 3e72d75..9d135ff 100644
  ########################################################################
  #
 diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
-index e33718b..a049c2c 100644
+index abdd98b..7d1c01d 100644
 --- a/googletest/CMakeLists.txt
 +++ b/googletest/CMakeLists.txt
-@@ -136,7 +136,8 @@ target_link_libraries(gtest_main PUBLIC gtest)
+@@ -148,7 +148,8 @@ target_link_libraries(gtest_main PUBLIC gtest)
  ########################################################################
  #
  # Install rules
@@ -27,17 +27,17 @@ index e33718b..a049c2c 100644
  ########################################################################
  #
 diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
-index 69defc8..cf7295a 100644
+index 8d8d60a..b08ce28 100644
 --- a/googletest/cmake/internal_utils.cmake
 +++ b/googletest/cmake/internal_utils.cmake
-@@ -317,11 +317,15 @@ function(install_project)
+@@ -315,11 +315,15 @@ function(install_project)
      install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
      # Install the project targets.
 +    set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR})
 +    if (${ARGN} MATCHES "_main")
 +      set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR}/manual-link)
-+    endif()
++    endif()    
      install(TARGETS ${ARGN}
        EXPORT ${targets_export_name}
        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
@@ -48,7 +48,7 @@ index 69defc8..cf7295a 100644
      if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
        # Install PDBs
        foreach(t ${ARGN})
-@@ -330,7 +334,7 @@ function(install_project)
+@@ -328,7 +332,7 @@ function(install_project)
          get_target_property(t_pdb_output_directory ${t} PDB_OUTPUT_DIRECTORY)
          install(FILES
            "${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$<CONFIG:Debug>:${t_pdb_name_debug}>$<$<NOT:$<CONFIG:Debug>>:${t_pdb_name}>.pdb"
@@ -57,7 +57,7 @@ index 69defc8..cf7295a 100644
            OPTIONAL)
        endforeach()
      endif()
-@@ -340,7 +344,7 @@ function(install_project)
+@@ -338,7 +342,7 @@ function(install_project)
        configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in"
          "${configured_pc}" @ONLY)
        install(FILES "${configured_pc}"
diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake
index 11ac1140a..69f7ddacf 100644
--- a/ports/gtest/portfile.cmake
+++ b/ports/gtest/portfile.cmake
@@ -5,13 +5,11 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/googletest
-    REF release-1.10.0
-    SHA512 bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9
+    REF f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4 #commite on 2021-04-29
+    SHA512 8168cc2b2c2f18ae7411db8a74369c98bb2d19b5be94a5a5f96a1d4e8e22b70c219c1cdfaef934b674d9c078dd97d0481c62e382aab432e3b89aa79ea5051673
     HEAD_REF master
     PATCHES
-        0002-Fix-z7-override.patch
         fix-main-lib-path.patch
-        fix-build-failure-in-gcc-11.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT)
diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json
new file mode 100644
index 000000000..0c718dc52
--- /dev/null
+++ b/ports/gtest/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "name": "gtest",
+  "version-date": "2021-05-07",
+  "description": "GoogleTest and GoogleMock testing frameworks",
+  "homepage": "https://github.com/google/googletest"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 5104d2819..7455b7c86 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2389,8 +2389,8 @@
       "port-version": 0
     },
     "gtest": {
-      "baseline": "1.10.0",
-      "port-version": 4
+      "baseline": "2021-05-07",
+      "port-version": 0
     },
     "gtk": {
       "baseline": "4.3.0",
diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json
index 25ef94eee..090e95999 100644
--- a/versions/g-/gtest.json
+++ b/versions/g-/gtest.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "c37414d7a3b02afc05799bf525acb49c5ee060d1",
+      "version-date": "2021-05-07",
+      "port-version": 0
+    },
+    {
       "git-tree": "9f4e8f94a3fe61d4abcc1929129b2e21ad6cc066",
       "version-string": "1.10.0",
       "port-version": 4