diff options
| author | Daniel Burrows <dburrows@debian.org> | 2011-07-23 15:51:23 -0700 |
|---|---|---|
| committer | Daniel Burrows <dburrows@debian.org> | 2011-07-23 15:51:23 -0700 |
| commit | 942616a01dfdebe8e040ce459f07d7527220ed9b (patch) | |
| tree | 06c49c47f53aab3e910c25ae90e91e34bd3f580c /tests | |
| parent | 0eb3c8672f554258bf19ff4aca9d610f2ee7da97 (diff) | |
| download | aptitude-942616a01dfdebe8e040ce459f07d7527220ed9b.tar.gz | |
Modify autoconf/automake scripts to handle gmock changes.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 5234d437..2ec9ec02 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir) BOOST_TEST_LDFLAGS = @BOOST_UNIT_TEST_LIBS@ -GMOCK_LDFLAGS = -lgmock -lgtest AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -DSRCDIR=\"$(srcdir)\" LDADD = $(top_builddir)/src/loggers.o \ $(top_builddir)/src/generic/apt/matching/libgeneric-matching.a \ @@ -33,6 +32,17 @@ interactive_set_test_SOURCES = interactive_set_test.cc test_choice.o test_choice_set.o test_resolver.o: $(top_srcdir)/src/generic/problemresolver/*.h test_promotion_set.o test_resolver_costs.o test_resolver_hints.o: $(top_srcdir)/src/generic/problemresolver/*.h +# Build a local copy of gmock if necessary. +if BUILD_LOCAL_GMOCK +noinst_LIBRARIES = libgmock.a + +GMOCK_LDFLAGS = $(srcdir)/libgmock.a -lgtest +libgmock_a_SOURCES = /usr/src/gmock/src/gmock-all.cc +libgmock_a_CPPFLAGS = -I/usr/src/gmock +else +GMOCK_LDFLAGS = -lgmock -lgtest +endif + # Note: test_apt_universe is not built by default because it takes way # too long. Of course, ideally this would be done in a less ad-hoc # way... |