From owner-svn-src-projects@freebsd.org Thu Feb 21 04:47:46 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 0FC2814F2421 for ; Thu, 21 Feb 2019 04:47:46 +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 A7F5C8BE93; Thu, 21 Feb 2019 04:47:45 +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 6D70018814; Thu, 21 Feb 2019 04:47:45 +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 x1L4ljk0050380; Thu, 21 Feb 2019 04:47:45 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1L4liIo050377; Thu, 21 Feb 2019 04:47:44 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902210447.x1L4liIo050377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Thu, 21 Feb 2019 04:47:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344420 - in projects/import-googletest-1.8.1: lib/googletest/gmock lib/googletest/gtest share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: lib/googletest/gmock lib/googletest/gtest share/mk X-SVN-Commit-Revision: 344420 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A7F5C8BE93 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,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 04:47:46 -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. 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