Skip to content

Commit 94870a2

Browse files
committed
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
2 parents 9ebf246 + dfab2d2 commit 94870a2

File tree

3 files changed

+1587
-2
lines changed

3 files changed

+1587
-2
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Updates since v1.4.1
1212

1313
* Patch VTK 8.2 to fix a compilation issue with gcc 10 in ThridParty/exoduxII
1414
* Patch VTK 8.x to fix a compilation issue with gcc 10.2 where the regex fails to detect the gcc version correctly.
15-
15+
* Patch GTest to fix maybe-uninitialized error build Debug mode with gcc11.
1616

1717
Updates since v1.4.0
1818
--------------------

Patches/GTest/Patch.cmake

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,14 @@ foreach(dir googletest googlemock)
1111
file(COPY ${GTest_patch}/${dir}/CMakeLists.txt DESTINATION ${GTest_source}/${dir})
1212
endforeach()
1313

14-
file(COPY ${GTest_patch}/googletest/cmake/internal_utils.cmake DESTINATION ${GTest_source}/googletest/cmake)
14+
file(COPY
15+
${GTest_patch}/googletest/cmake/internal_utils.cmake
16+
DESTINATION
17+
${GTest_source}/googletest/cmake
18+
)
19+
20+
file(COPY
21+
${GTest_patch}/googletest/src/gtest-death-test.cc
22+
DESTINATION
23+
${GTest_source}/googletest/src/
24+
)

0 commit comments

Comments
 (0)