Update gtest Makefile setup

Summary: As title. This should fix the incomplete transition to a separate builddir.

Reviewed By: beicy

Differential Revision: D54360694

fbshipit-source-id: a87c31f8082b950b56e30857f6aa5a20a6231d6b

test/Makefile.am

@@ -2,25 +2,29 @@ SUBDIRS = . integ unit
 
 check_LTLIBRARIES = libgtest.la libgtest_main.la libgmock_main.la
 
-libgtest_la_CPPFLAGS = -I$(srcdir)/googletest-release-1.10.0/googletest -I$(srcdir)/googletest-release-1.10.0/googletest/include
-libgtest_la_SOURCES = googletest-release-1.10.0/googletest/src/gtest-all.cc
+# Note: Use at least 1.10 as we need googlemock, too.
+GOOGLETEST_MIN_VERSION = 1.10.0
 
-libgtest_main_la_CPPFLAGS = -I$(srcdir)/googletest-release-1.10.0/googletest -I$(srcdir)/googletest-release-1.10.0/googletest/include
-libgtest_main_la_SOURCES = googletest-release-1.10.0/googletest/src/gtest_main.cc
+libgtest_la_CPPFLAGS = -I$(srcdir)/googletest-release-$(GOOGLETEST_MIN_VERSION)/googletest -I$(srcdir)/googletest-release-$(GOOGLETEST_MIN_VERSION)/googletest/include
+libgtest_la_SOURCES = googletest-release-$(GOOGLETEST_MIN_VERSION)/googletest/src/gtest-all.cc
+
+libgtest_main_la_CPPFLAGS = -I$(srcdir)/googletest-release-$(GOOGLETEST_MIN_VERSION)/googletest -I$(srcdir)/googletest-release-$(GOOGLETEST_MIN_VERSION)/googletest/include
+libgtest_main_la_SOURCES = googletest-release-$(GOOGLETEST_MIN_VERSION)/googletest/src/gtest_main.cc
 libgtest_main_la_LIBADD = libgtest.la
 
-libgmock_main_la_CPPFLAGS = -I$(srcdir)/googletest-release-1.10.0/googlemock -I$(srcdir)/googletest-release-1.10.0/googlemock/include -I$(srcdir)/googletest-release-1.10.0/googletest/include
-libgmock_main_la_SOURCES = googletest-release-1.10.0/googlemock/src/gmock-all.cc googletest-release-1.10.0/googlemock/src/gmock_main.cc
+libgmock_main_la_CPPFLAGS = -I$(srcdir)/googletest-release-$(GOOGLETEST_MIN_VERSION)/googlemock -I$(srcdir)/googletest-release-$(GOOGLETEST_MIN_VERSION)/googlemock/include -I$(srcdir)/googletest-release-$(GOOGLETEST_MIN_VERSION)/googletest/include
+libgmock_main_la_SOURCES = googletest-release-$(GOOGLETEST_MIN_VERSION)/googlemock/src/gmock-all.cc googletest-release-$(GOOGLETEST_MIN_VERSION)/googlemock/src/gmock_main.cc
 
 # Hack: auto-download googletest.
 
-googletest-release-1.10.0/googletest/src/gtest-all.cc \
-googletest-release-1.10.0/googletest/src/gtest_main.cc \
-googletest-release-1.10.0/googlemock/src/gmock-all.cc \
-googletest-release-1.10.0/googlemock/src/gmock_main.cc: setup_gtest
+googletest-release-$(GOOGLETEST_MIN_VERSION)/googletest/src/gtest-all.cc \
+googletest-release-$(GOOGLETEST_MIN_VERSION)/googletest/src/gtest_main.cc \
+googletest-release-$(GOOGLETEST_MIN_VERSION)/googlemock/src/gmock-all.cc \
+googletest-release-$(GOOGLETEST_MIN_VERSION)/googlemock/src/gmock_main.cc: setup_gtest
 
 setup_gtest:
-	./setup.sh
+	curl https://codeload.github.com/google/googletest/zip/release-$(GOOGLETEST_MIN_VERSION) -o gtest-$(GOOGLETEST_MIN_VERSION).zip
+	unzip -o gtest-$(GOOGLETEST_MIN_VERSION).zip
 	touch setup_gtest
 
 check_SCRIPTS = check_num_passes.sh