Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: testing/gmock/Makefile.am

Issue 1151006: Update to current gtest/gmock. (Closed)
Patch Set: rebase Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/gmock/CHANGES ('k') | testing/gmock/README » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/gmock/Makefile.am
diff --git a/testing/gmock/Makefile.am b/testing/gmock/Makefile.am
index c10d81cddf6f3bcceb614afda1be822e4031ab99..30941d4f0d1a2e33bc01a5fb7576f76b8a72b4e9 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
« no previous file with comments | « testing/gmock/CHANGES ('k') | testing/gmock/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698