Date: Wed, 20 Feb 2019 06:03:21 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344339 - in projects/import-googletest-1.8.1: cddl/usr.sbin/zfsd lib/googletest/gmock lib/googletest/gmock_main lib/googletest/gtest lib/googletest/gtest_main Message-ID: <201902200603.x1K63LnV083929@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Feb 20 06:03:21 2019 New Revision: 344339 URL: https://svnweb.freebsd.org/changeset/base/344339 Log: Sprinkle `${HAS_TESTS}` in Makefiles While here, reindent `SUBDIR.${MK_TESTS}` Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile ============================================================================== --- projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile Wed Feb 20 05:56:07 2019 (r344338) +++ projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile Wed Feb 20 06:03:21 2019 (r344339) @@ -7,6 +7,7 @@ PROG_CXX= zfsd MAN= zfsd.8 -SUBDIR.${MK_GOOGLETEST}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Wed Feb 20 05:56:07 2019 (r344338) +++ projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Wed Feb 20 06:03:21 2019 (r344339) @@ -42,4 +42,7 @@ INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-gen SRCS+= gmock-all.cc +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include <bsd.lib.mk> Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile Wed Feb 20 05:56:07 2019 (r344338) +++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile Wed Feb 20 06:03:21 2019 (r344339) @@ -19,6 +19,7 @@ LDFLAGS+= -L${LIBGMOCKDIR} SRCS+= gmock_main.cc -SUBDIR.${MK_TESTS}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include <bsd.lib.mk> Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile Wed Feb 20 05:56:07 2019 (r344338) +++ projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile Wed Feb 20 06:03:21 2019 (r344339) @@ -47,6 +47,7 @@ SRCS+= gtest-all.cc LIBADD+= pthread -SUBDIR.${MK_TESTS}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include <bsd.lib.mk> Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Wed Feb 20 05:56:07 2019 (r344338) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Wed Feb 20 06:03:21 2019 (r344339) @@ -17,6 +17,7 @@ LDFLAGS+= -L${LIBGTESTDIR} SRCS+= gtest_main.cc -SUBDIR.${MK_TESTS}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include <bsd.lib.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902200603.x1K63LnV083929>