Author: ngie
Date: Thu Mar 28 17:22:31 2019
New Revision: 345645
URL: https://svnweb.freebsd.org/changeset/base/345645
Log:
Spam CXXFLAGS with `-I${DESTDIR}/usr/include/private`, instead of
GTEST_CXXFLAGS
This makes it easier for googletest users to leverage googletest, instead of
forcing them to plug GTEST_CXXFLAGS into CXXFLAGS manually (resulting in
unnecessary duplication).
I will be following this up with a more proper fix in src.libnames.mk, as
src.libnames.mk should be automatically adding this directory to
CFLAGS/CXXFLAGS when private libraries are referenced. Not doing so can result
in mismatches between base-provided private library's and ports-provided
library's headers.
While here, tweak the comment to clarify what the intent is behind spamming
CXXFLAGS.
MFC after: 5 weeks
MFC with: r345203
Reported by: asomers
Reviewed by: asomers
Approved by: emaste (mentor)
Differential Revision: https://reviews.freebsd.org/D19731
Modified:
head/share/mk/googletest.test.inc.mk
Modified: head/share/mk/googletest.test.inc.mk
==============================================================================
--- head/share/mk/googletest.test.inc.mk Thu Mar 28 16:17:33 2019
(r345644)
+++ head/share/mk/googletest.test.inc.mk Thu Mar 28 17:22:31 2019
(r345645)
@@ -9,7 +9,8 @@ GTESTS_CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1
GTESTS_CXXFLAGS+= -frtti
GTESTS_CXXFLAGS+= -std=${CXXSTD}
-# XXX: src.libnames.mk should handle adding this directory.
-GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private
+# XXX: src.libnames.mk should handle adding this directory for libgtest's,
+# libgmock's, etc, headers.
+CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private
NO_WTHREAD_SAFETY=
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
