From owner-svn-src-projects@freebsd.org Thu Feb 21 06:23: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 1843D14F7A3C for ; Thu, 21 Feb 2019 06:23:36 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7BFDC905EB; Thu, 21 Feb 2019 06:23:35 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x1L6NWba018775; Wed, 20 Feb 2019 22:23:32 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id x1L6NWY9018774; Wed, 20 Feb 2019 22:23:32 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201902210623.x1L6NWY9018774@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r344420 - in projects/import-googletest-1.8.1: lib/googletest/gmock lib/googletest/gtest share/mk In-Reply-To: <201902210447.x1L4liIo050377@repo.freebsd.org> To: Enji Cooper Date: Wed, 20 Feb 2019 22:23:32 -0800 (PST) CC: src-committers@freebsd.org, svn-src-projects@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 7BFDC905EB X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.96)[-0.963,0] 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: Thu, 21 Feb 2019 06:23:36 -0000 > Author: ngie > Date: Thu Feb 21 04:47:44 2019 > New Revision: 344420 > URL: https://svnweb.freebsd.org/changeset/base/344420 > > Log: > Use gmock/gtest headers when PRIVATELIB is defined > > The move to /usr/include/private prefixed paths seems to require a bit more > effort in order to compile programs. > > Install the headers to /usr/include/private/g{mock,test}/... and automatically > include /usr/include/private in GTESTS_CXXFLAGS to make compilation seamless. I > will work on the more global problem later with @bdrewery. Is this also hooked in to a (cd /usr/src/ && make includes) if gtest is enabled? > > Modified: > projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile > projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile > projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk > > Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile > ============================================================================== > --- projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Thu Feb 21 04:13:20 2019 (r344419) > +++ projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Thu Feb 21 04:47:44 2019 (r344420) > @@ -17,7 +17,7 @@ LDFLAGS+= -L${.OBJDIR:H}/gtest > > INCSGROUPS= MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS > > -MAIN_INCSDIR= ${INCLUDEDIR}/gmock > +MAIN_INCSDIR= ${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}} > MAIN_INCS+= gmock/gmock-matchers.h > MAIN_INCS+= gmock/gmock-more-actions.h > MAIN_INCS+= gmock/gmock-generated-actions.h > @@ -30,12 +30,12 @@ MAIN_INCS+= gmock/gmock-spec-builders.h > MAIN_INCS+= gmock/gmock.h > MAIN_INCS+= gmock/gmock-actions.h > > -INTERNAL_INCSDIR= ${INCLUDEDIR}/gmock/internal > +INTERNAL_INCSDIR= ${MAIN_INCSDIR}/internal > INTERNAL_INCS+= gmock/internal/gmock-port.h > INTERNAL_INCS+= gmock/internal/gmock-internal-utils.h > INTERNAL_INCS+= gmock/internal/gmock-generated-internal-utils.h > > -INTERNAL_CUSTOM_INCSDIR= ${INCLUDEDIR}/gmock/internal/custom > +INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom > INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-port.h > INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-matchers.h > INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-generated-actions.h > > Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile > ============================================================================== > --- projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile Thu Feb 21 04:13:20 2019 (r344419) > +++ projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile Thu Feb 21 04:47:44 2019 (r344420) > @@ -13,7 +13,7 @@ CXXFLAGS+= -I${GOOGLETEST_SRCROOT} > > INCSGROUPS= MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS > > -MAIN_INCSDIR= ${INCLUDEDIR}/gtest > +MAIN_INCSDIR= ${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}} > MAIN_INCS+= gtest/gtest-death-test.h > MAIN_INCS+= gtest/gtest-message.h > MAIN_INCS+= gtest/gtest-param-test.h > @@ -25,7 +25,7 @@ MAIN_INCS+= gtest/gtest.h > MAIN_INCS+= gtest/gtest_pred_impl.h > MAIN_INCS+= gtest/gtest_prod.h > > -INTERNAL_INCSDIR= ${INCLUDEDIR}/gtest/internal > +INTERNAL_INCSDIR= ${MAIN_INCSDIR}/internal > INTERNAL_INCS+= gtest/internal/gtest-death-test-internal.h > INTERNAL_INCS+= gtest/internal/gtest-filepath.h > INTERNAL_INCS+= gtest/internal/gtest-internal.h > @@ -38,7 +38,7 @@ INTERNAL_INCS+= gtest/internal/gtest-string.h > INTERNAL_INCS+= gtest/internal/gtest-tuple.h > INTERNAL_INCS+= gtest/internal/gtest-type-util.h > > -INTERNAL_CUSTOM_INCSDIR= ${INCLUDEDIR}/gtest/internal/custom > +INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom > INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest-port.h > INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest-printers.h > INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest.h > > 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 Thu Feb 21 04:13:20 2019 (r344419) > +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 04:47:44 2019 (r344420) > @@ -7,3 +7,6 @@ GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1 > GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1 > GTESTS_CXXFLAGS+= -frtti > GTESTS_CXXFLAGS+= -std=c++11 > + > +# XXX: src.libnames.mk should handle adding this directory. > +GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private > > -- Rod Grimes rgrimes@freebsd.org