Link libgtest to test-kvp-value on Fedora.

This commit is contained in:
John Ralls 2015-05-04 15:52:35 -07:00
parent 90f0d9952c
commit 0b55c746c8

View File

@ -40,7 +40,8 @@ test_kvp_value_SOURCES = \
test-kvp-frame.cpp test-kvp-frame.cpp
test_kvp_value_LDADD = \ test_kvp_value_LDADD = \
$(top_builddir)/$(MODULEPATH)/libgnc-qof.la \ $(top_builddir)/$(MODULEPATH)/libgnc-qof.la \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GTEST_LIBS) \
$(BOOST_LDFLAGS) $(BOOST_LDFLAGS)
if !GOOGLE_TEST_LIBS if !GOOGLE_TEST_LIBS
@ -50,7 +51,7 @@ test_kvp_value_LDADD += $(top_builddir)/src/test-core/libgtest.a
endif endif
test_kvp_value_CPPFLAGS = \ test_kvp_value_CPPFLAGS = \
-I$(GTEST_HEADERS) \ $(GTEST_HEADERS) \
-I$(top_srcdir)/$(MODULEPATH) \ -I$(top_srcdir)/$(MODULEPATH) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(BOOST_CPPFLAGS) $(BOOST_CPPFLAGS)
@ -62,8 +63,7 @@ test_gnc_int128_SOURCES = \
gtest-gnc-int128.cpp gtest-gnc-int128.cpp
test_gnc_int128_CPPFLAGS = -I${GTEST_HEADERS} test_gnc_int128_CPPFLAGS = -I${GTEST_HEADERS}
test_gnc_int128_LDADD = ${GTEST_LIBS}
test_gnc_int128_LDADD = $(GTEST_LIBS)
if !GOOGLE_TEST_LIBS if !GOOGLE_TEST_LIBS
nodist_test_gnc_int128_SOURCES = \ nodist_test_gnc_int128_SOURCES = \
${GTEST_SRC}/src/gtest_main.cc ${GTEST_SRC}/src/gtest_main.cc