gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makes generation of fused sources contingent on availability of Python and pulls in gtest r580.

Browse Source
This commit is contained in:
vladlosev 2011-04-21 21:56:01 +00:00
parent 8d3dc0cdd8
commit a63da04126
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@ -73,16 +73,18 @@ test_gmock_link_test_SOURCES = \
test/gmock_link_test.h test/gmock_link_test.h
test_gmock_link_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la lib/libgmock.la test_gmock_link_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la lib/libgmock.la
# Tests that fused gmock files compile and work. if HAVE_PYTHON
TESTS += test/gmock_fused_test # Tests that fused gmock files compile and work.
check_PROGRAMS += test/gmock_fused_test TESTS += test/gmock_fused_test
test_gmock_fused_test_SOURCES = \ check_PROGRAMS += test/gmock_fused_test
test_gmock_fused_test_SOURCES = \
fused-src/gmock-gtest-all.cc \ fused-src/gmock-gtest-all.cc \
fused-src/gmock/gmock.h \ fused-src/gmock/gmock.h \
fused-src/gmock_main.cc \ fused-src/gmock_main.cc \
fused-src/gtest/gtest.h \ fused-src/gtest/gtest.h \
test/gmock_test.cc test/gmock_test.cc
test_gmock_fused_test_CPPFLAGS = -I"$(srcdir)/fused-src" test_gmock_fused_test_CPPFLAGS = -I"$(srcdir)/fused-src"
endif
# Google Mock source files that we don't compile directly. # Google Mock source files that we don't compile directly.
GMOCK_SOURCE_INGLUDES = \ GMOCK_SOURCE_INGLUDES = \
@ -169,6 +171,7 @@ EXTRA_DIST += \
msvc/2010/gmock_main.vcxproj \ msvc/2010/gmock_main.vcxproj \
msvc/2010/gmock_test.vcxproj msvc/2010/gmock_test.vcxproj
if HAVE_PYTHON
# gmock_test.cc does not really depend on files generated by the # gmock_test.cc does not really depend on files generated by the
# fused-gmock-internal rule. However, gmock_test.o does, and it is # fused-gmock-internal rule. However, gmock_test.o does, and it is
# important to include test/gmock_test.cc as part of this rule in order to # important to include test/gmock_test.cc as part of this rule in order to
@ -191,6 +194,7 @@ fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
maintainer-clean-local: maintainer-clean-local:
rm -rf "$(srcdir)/fused-src" rm -rf "$(srcdir)/fused-src"
endif
# Death tests may produce core dumps in the build directory. In case # Death tests may produce core dumps in the build directory. In case
# this happens, clean them to keep distcleancheck happy. # this happens, clean them to keep distcleancheck happy.