diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2023-08-08 06:17:32 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2023-08-10 09:32:33 +0000 |
commit | 28f6c2f292806bf31230a959bc4b19d7081669a7 (patch) | |
tree | 9dcddc020fbf236198f9f3c8056e1e670121a667 /contrib/googletest/Makefile.am | |
parent | 9228ac3a69c4c7401a743e6465e118101a2beeb0 (diff) |
Import GoogleTest 1.14.0
GoogleTest 1.14.0 now requires C++14 to build. Change
`googletest.test.inc.mk` to reflect this requirement.
Adjust the build integration logic to handle the new version of
GoogleTest (add/remove headers/sources as needed).
Tighten down warnings via `CXXFLAGS.clang` instead of ignoring all
warnings. Some new warnings snuck in after I did my last round of fix
submissions upstream.
Also address some overlinking added in the previous version import by
removing superfluous libraries.
===============================
Expect WhenDynamicCastToTest.AmbiguousCast to fail
This change reapplies the expected failure from 1.10.0.
Ref: https://github.com/google/googletest/issues/2172
MFC after: 2 weeks
Reviewed by: asomers, emaste
Differential Revision: https://reviews.freebsd.org/D41399
Merge commit '8ef491440fcaec96f899d73e08873426c78583a4' into googletest-v1.14.0-import
Diffstat (limited to 'contrib/googletest/Makefile.am')
-rw-r--r-- | contrib/googletest/Makefile.am | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/contrib/googletest/Makefile.am b/contrib/googletest/Makefile.am deleted file mode 100644 index 433eefeb0802..000000000000 --- a/contrib/googletest/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to produce Makefile.in -ACLOCAL_AMFLAGS = -I m4 - -AUTOMAKE_OPTIONS = foreign - -# Build . before src so that our all-local and clean-local hooks kicks in at -# the right time. -SUBDIRS = googletest googlemock - -EXTRA_DIST = \ - BUILD.bazel \ - CMakeLists.txt \ - README.md \ - WORKSPACE |