From 4783c2dda5e82fb8fc7cd67fbc2b1206326278e5 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 20 Feb 2019 09:33:55 +0000 Subject: [PATCH] Fix test compilation for gmock_main tests, similar to r344345 --- lib/googletest/gmock_main/tests/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/googletest/gmock_main/tests/Makefile b/lib/googletest/gmock_main/tests/Makefile index bf2ee35d7b4..106b9d791e9 100644 --- a/lib/googletest/gmock_main/tests/Makefile +++ b/lib/googletest/gmock_main/tests/Makefile @@ -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