Merge branch 'release'

* release: Update release-notes GTest fails with gcc11 Debug maybe-uninitialized is an error Setup GTest patch for c++11 error Add v1.5.0 minor release notes
Kitware · May 26, 2021 · 94870a2 · 94870a2
2 parents 9ebf246 + dfab2d2
commit 94870a2
Show file tree

Hide file tree

Showing 3 changed files with 1,587 additions and 2 deletions.
diff --git a/Doc/release-notes/master.txt → Doc/release-notes/v1.5.0.txt b/Doc/release-notes/master.txt → Doc/release-notes/v1.5.0.txt
@@ -12,7 +12,7 @@ Updates since v1.4.1
 
  * Patch VTK 8.2 to fix a compilation issue with gcc 10 in ThridParty/exoduxII
  * Patch VTK 8.x to fix a compilation issue with gcc 10.2 where the regex fails to detect the gcc version correctly.
-
+ * Patch GTest to fix maybe-uninitialized error build Debug mode with gcc11.
 
 Updates since v1.4.0
 --------------------

diff --git a/Patches/GTest/Patch.cmake b/Patches/GTest/Patch.cmake
@@ -11,4 +11,14 @@ foreach(dir googletest googlemock)
   file(COPY ${GTest_patch}/${dir}/CMakeLists.txt DESTINATION ${GTest_source}/${dir})
 endforeach()
 
- file(COPY ${GTest_patch}/googletest/cmake/internal_utils.cmake DESTINATION ${GTest_source}/googletest/cmake)
+file(COPY
+  ${GTest_patch}/googletest/cmake/internal_utils.cmake
+  DESTINATION
+  ${GTest_source}/googletest/cmake
+  )
+
+file(COPY
+  ${GTest_patch}/googletest/src/gtest-death-test.cc
+  DESTINATION
+  ${GTest_source}/googletest/src/
+  )