From owner-svn-src-projects@freebsd.org Tue Mar 12 01:12:36 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3B091535808 for ; Tue, 12 Mar 2019 01:12:35 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 98DCF8D993; Tue, 12 Mar 2019 01:12:35 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A2361B195; Tue, 12 Mar 2019 01:12:35 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2C1CZuj056608; Tue, 12 Mar 2019 01:12:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2C1CZcv056607; Tue, 12 Mar 2019 01:12:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903120112.x2C1CZcv056607@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Tue, 12 Mar 2019 01:12:35 +0000 (UTC) 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 X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: share/mk tools/build/options X-SVN-Commit-Revision: 345045 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 98DCF8D993 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2019 01:12:36 -0000 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.