summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-05-10 17:11:58 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-05-10 17:11:58 +0000
commit678f92b8f17c8edf1a21efb401c91b355fe7bb2b (patch)
tree1e633f4afd1e86e367d7d10cb0467fc910d03464 /Makefile.am
parente261709b8b1e0b25d10f1e593468535868d754af (diff)
downloadgtest-678f92b8f17c8edf1a21efb401c91b355fe7bb2b.tar.gz
gtest-678f92b8f17c8edf1a21efb401c91b355fe7bb2b.tar.bz2
gtest-678f92b8f17c8edf1a21efb401c91b355fe7bb2b.tar.xz
Moves the universal printer from gmock to gtest and refactors the cmake script for reusing in gmock (by Vlad Losev).
git-svn-id: http://googletest.googlecode.com/svn/trunk@425 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 8d75e32..b4ebc7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,7 @@ GTEST_SRC = \
src/gtest-filepath.cc \
src/gtest-internal-inl.h \
src/gtest-port.cc \
+ src/gtest-printers.cc \
src/gtest-test-part.cc \
src/gtest-typed-test.cc
@@ -52,6 +53,7 @@ EXTRA_DIST += \
test/gtest-param-test2_test.cc \
test/gtest-param-test_test.h \
test/gtest-port_test.cc \
+ test/gtest-printers_test.cc \
test/gtest_pred_impl_unittest.cc \
test/gtest_prod_test.cc \
test/production.cc \
@@ -186,6 +188,7 @@ pkginclude_HEADERS = include/gtest/gtest.h \
include/gtest/gtest-message.h \
include/gtest/gtest-param-test.h \
include/gtest/gtest_pred_impl.h \
+ include/gtest/gtest-printers.h \
include/gtest/gtest_prod.h \
include/gtest/gtest-spi.h \
include/gtest/gtest-test-part.h \