Date: Tue, 12 Mar 2019 01:12:35 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345045 - in projects/import-googletest-1.8.1: share/mk tools/build/options Message-ID: <201903120112.x2C1CZcv056607@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Mar 12 01:12:34 2019 New Revision: 345045 URL: https://svnweb.freebsd.org/changeset/base/345045 Log: Adjust code based on comments from @asomers in D19551 Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Tue Mar 12 00:10:31 2019 (r345044) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Tue Mar 12 01:12:34 2019 (r345045) @@ -1,10 +1,13 @@ # $FreeBSD$ +# XXX: this should be defined in bsd.sys.mk +CXXSTD?= c++11 + GTESTS_CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1 GTESTS_CXXFLAGS+= -DGTEST_HAS_PTHREAD=1 GTESTS_CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1 GTESTS_CXXFLAGS+= -frtti -GTESTS_CXXFLAGS+= -std=c++11 +GTESTS_CXXFLAGS+= -std=${CXXSTD} # XXX: src.libnames.mk should handle adding this directory. GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private Modified: projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST ============================================================================== --- projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST Tue Mar 12 00:10:31 2019 (r345044) +++ projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST Tue Mar 12 01:12:34 2019 (r345045) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -Set to not build nor install +Set to neither build nor install .Lb libgmock , .Lb libgtest , and dependent tests.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903120112.x2C1CZcv056607>