IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-23 09:26:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move libgtest.a arg from Makefile to configure, add -pthread flag.

Browse Source
This commit is contained in:
John Ralls 2015-07-07 16:43:52 -07:00
parent df05702ffb
commit d3e70217cd
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -866,6 +866,7 @@ fi
if test x$ac_cv_file__usr_include_gmock_gmock_h = xyes -a x$ac_cv_file__usr_include_gtest_gtest_h = xyes; then
if test x$ac_cv_file__usr_src_gmock_src_gmock_all_cc = xyes -a x$ac_cv_file__usr_src_gtest_src_gtest_all_cc = xyes; then
ac_cv_gtest_system_install=yes
ac_cv_gtest_libs="\$(top_builddir)/src/test-core/libgtest.a -pthread"
elif test "x$ac_cv_have_gtest_libs" = xyes; then
ac_cv_gtest_system_install=yes
ac_cv_gtest_libs="-lgtest -lgtest_main"
@ -925,9 +926,6 @@ if test x$enable_google_test = xyes; then
fi
fi
dnl Fedora installs gmock sources in /usr/src/gmock without a src
dnl subdir, unlike Debian or the distribution tarball, so we have to
dnl make GMOCK_ROOT include src if it's there.
if test -n "$ac_cv_gmock_root" -a -r "$ac_cv_gmock_root/gmock-all.cc"; then
ac_cv_gmock_src_path="$ac_cv_gmock_root"
@ -946,7 +944,7 @@ if test x$enable_google_test = xyes; then
else
ac_cv_gmock_src_path=""
fi
ac_cv_gmock_root="$ac_cv_gmock_src_path"
ac_cv_gmock_root="/usr/src/gmock"
else
ac_cv_gmock_root=""
fi
@ -986,7 +984,7 @@ AC_SUBST([GMOCK_SRC_PATH], [$ac_cv_gmock_src_path])
AC_SUBST([GMOCK_SRC], [$ac_cv_gmock_root])
AC_SUBST([GMOCK_HEADERS], [$ac_cv_gmock_headers])
AM_CONDITIONAL([WITH_GOOGLE_TEST], [test "x$enable_google_test" = "xyes"])
AM_CONDITIONAL([GOOGLE_TEST_LIBS], [test "x$ac_cv_gtest_libs" != "x"])
AM_CONDITIONAL([GOOGLE_TEST_LIBS], [test "x$ac_cv_have_gtest_libs" == "xyes"])
### --------------------------------------------------------------------------
### Register2
AC_ARG_ENABLE( register2,

1
src/engine/test/Makefile.am
View File

@ -143,7 +143,6 @@ test_import_map_LDADD = \
if !GOOGLE_TEST_LIBS
nodist_test_import_map_SOURCES = \
${GTEST_SRC}/src/gtest_main.cc
test_import_map_LDADD += ${top_builddir}/src/test-core/libgtest.a
endif
test_import_map_CPPFLAGS = \

4
src/libqof/qof/test/Makefile.am
View File

@ -46,7 +46,6 @@ test_kvp_value_LDADD = \
if !GOOGLE_TEST_LIBS
nodist_test_kvp_value_SOURCES = \
${GTEST_SRC}/src/gtest_main.cc
test_kvp_value_LDADD += $(top_builddir)/src/test-core/libgtest.a
endif
test_kvp_value_CPPFLAGS = \
@ -66,7 +65,6 @@ test_gnc_int128_LDADD = ${GTEST_LIBS}
if !GOOGLE_TEST_LIBS
nodist_test_gnc_int128_SOURCES = \
${GTEST_SRC}/src/gtest_main.cc
test_gnc_int128_LDADD += $(top_builddir)/src/test-core/libgtest.a
endif
check_PROGRAMS += test-gnc-int128
@ -82,7 +80,6 @@ test_gnc_timezone_LDADD = $(GTEST_LIBS)
if !GOOGLE_TEST_LIBS
nodist_test_gnc_timezone_SOURCES = \
${GTEST_SRC}/src/gtest_main.cc
test_gnc_timezone_LDADD += $(top_builddir)/src/test-core/libgtest.a
endif
check_PROGRAMS += test-gnc-timezone
@ -100,7 +97,6 @@ test_gnc_datetime_LDADD = \
if !GOOGLE_TEST_LIBS
nodist_test_gnc_datetime_SOURCES = \
$(GTEST_SRC)/src/gtest_main.cc
test_gnc_datetime_LDADD += $(top_builddir)/src/test-core/libgtest.a
endif
check_PROGRAMS += test-gnc-datetime