From 762217321f240970b7a7dc404470caedbf43cd5e Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Thu, 25 Mar 2010 17:03:47 +0000 Subject: Update to current gtest/gmock. Synced in new gmock, twiddled DEPS for new gtest, updated README. BUG=34160 Review URL: http://codereview.chromium.org/1151006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42625 0039d316-1c4b-4281-b951-d872f2087c98 --- testing/gmock/Makefile.am | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'testing/gmock/Makefile.am') diff --git a/testing/gmock/Makefile.am b/testing/gmock/Makefile.am index c10d81c..30941d4f 100644 --- a/testing/gmock/Makefile.am +++ b/testing/gmock/Makefile.am @@ -1,3 +1,5 @@ +# Automake file + # Nonstandard package files for distribution. EXTRA_DIST = @@ -16,6 +18,12 @@ DISTCLEANFILES = scripts/gmock-config # directories. AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I$(srcdir)/include +# Modifies compiler and linker flags for pthreads compatibility. +if HAVE_PTHREADS + AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1 + AM_LIBS = @PTHREAD_LIBS@ +endif + # Build rules for libraries. lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la -- cgit v1.1