Date: Wed, 20 Feb 2019 09:33:55 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344350 - projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests Message-ID: <201902200933.x1K9XtKk094305@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Feb 20 09:33:55 2019 New Revision: 344350 URL: https://svnweb.freebsd.org/changeset/base/344350 Log: Fix test compilation for gmock_main tests, similar to r344345 Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Wed Feb 20 08:04:08 2019 (r344349) +++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Wed Feb 20 09:33:55 2019 (r344350) @@ -6,7 +6,7 @@ GTESTS+= gmock-actions_test GTESTS+= gmock-cardinalities_test -GTESTS+= gmock-ex_test +GTESTS+= gmock_ex_test GTESTS+= gmock-generated-actions_test GTESTS+= gmock-generated-function-mockers_test GTESTS+= gmock-generated-internal-utils_test @@ -22,13 +22,16 @@ GTESTS+= gmock_test CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} +CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include +CXXFLAGS+= -I${GOOGLETEST_SRCROOT} -.for test in ${GTESTS} -SRCS.${test}= gmock_main.cc -.endfor +SRCS.gmock_link_test= \ + gmock_link_test.cc \ + gmock_link2_test.cc -SRCS.gmock_link_test+= gmock_link2_test.cc +LIBADD= gmock_main gmock gtest -LIBADD= gmock +# XXX: https://github.com/google/googletest/pull/2119 +NO_WERROR= .include <bsd.test.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902200933.x1K9XtKk094305>