Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Feb 2019 04:52:12 +0000 (UTC)
From:      Enji Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r344457 - projects/import-googletest-1.8.1/share/mk
Message-ID:  <201902220452.x1M4qC98010418@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Fri Feb 22 04:52:12 2019
New Revision: 344457
URL: https://svnweb.freebsd.org/changeset/base/344457

Log:
  Remove redundant CXXFLAGS and fix constant names
  
  - Specifying -std=c++11 and -frtti tweaks those flags with clang/gcc.
  - The constants are prefixed with `GTEST_`, not `GTESTS_`.

Modified:
  projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk

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	Fri Feb 22 03:11:27 2019	(r344456)
+++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk	Fri Feb 22 04:52:12 2019	(r344457)
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-GTESTS_CXXFLAGS+= -DGTESTS_HAS_RTTI=1
-GTESTS_CXXFLAGS+= -DGTESTS_HAS_POSIX_RE=1
-GTESTS_CXXFLAGS+= -DGTESTS_HAS_PTHREAD=1
-GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1
-GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1
+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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902220452.x1M4qC98010418>