Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
a63da041
Commit
a63da041
authored
Apr 21, 2011
by
vladlosev
Browse files
Makes generation of fused sources contingent on availability of Python and pulls in gtest r580.
parent
8d3dc0cd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
10 deletions
+14
-10
Makefile.am
Makefile.am
+14
-10
No files found.
Makefile.am
View file @
a63da041
...
...
@@ -73,16 +73,18 @@ test_gmock_link_test_SOURCES = \
test
/gmock_link_test.h
test_gmock_link_test_LDADD
=
$(GTEST_LIBS)
lib/libgmock_main.la lib/libgmock.la
# Tests that fused gmock files compile and work.
TESTS
+=
test
/gmock_fused_test
check_PROGRAMS
+=
test
/gmock_fused_test
test_gmock_fused_test_SOURCES
=
\
if
HAVE_PYTHON
# Tests that fused gmock files compile and work.
TESTS
+=
test
/gmock_fused_test
check_PROGRAMS
+=
test
/gmock_fused_test
test_gmock_fused_test_SOURCES
=
\
fused-src/gmock-gtest-all.cc
\
fused-src/gmock/gmock.h
\
fused-src/gmock_main.cc
\
fused-src/gtest/gtest.h
\
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.
GMOCK_SOURCE_INGLUDES
=
\
...
...
@@ -169,6 +171,7 @@ EXTRA_DIST += \
msvc/2010/gmock_main.vcxproj
\
msvc/2010/gmock_test.vcxproj
if
HAVE_PYTHON
# gmock_test.cc does not really depend on files generated by the
# 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
...
...
@@ -191,6 +194,7 @@ fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
maintainer-clean-local
:
rm
-rf
"
$(srcdir)
/fused-src"
endif
# Death tests may produce core dumps in the build directory. In case
# this happens, clean them to keep distcleancheck happy.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment