Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "googletest"]
path = googletest
url = https://github.com/google/googletest.git
51 changes: 5 additions & 46 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -36,53 +36,12 @@ library_includedir = $(includedir)/$(MURRAYC_TUPLE_UTILS_MODULE_NAME)
nobase_library_include_HEADERS = $(h_sources_public)


# Build googletest:
gtest_top = googletest/googletest
check_LTLIBRARIES = libgtest.la
libgtest_la_SOURCES = googletest/googletest/src/gtest-all.cc \
googletest/googletest/src/gtest_main.cc

libgtest_la_CPPFLAGS = -I$(top_srcdir)/$(gtest_top)/include -I$(top_srcdir)/$(gtest_top) \
$(PROJECT_GTEST_WXXFLAGS)
libgtest_la_LDFLAGS = -pthread
EXTRA_DIST = $(gtest_top)/src/gtest-all.cc \
$(gtest_top)/src/gtest-filepath.cc \
$(gtest_top)/src/gtest-printers.cc \
$(gtest_top)/src/gtest.cc \
$(gtest_top)/src/gtest_main.cc \
$(gtest_top)/src/gtest-matchers.cc \
$(gtest_top)/src/gtest-test-part.cc \
$(gtest_top)/src/gtest-death-test.cc \
$(gtest_top)/src/gtest-port.cc \
$(gtest_top)/src/gtest-typed-test.cc \
$(gtest_top)/src/gtest-internal-inl.h \
$(gtest_top)/include/gtest/gtest-death-test.h \
$(gtest_top)/include/gtest/gtest_pred_impl.h \
$(gtest_top)/include/gtest/gtest-test-part.h \
$(gtest_top)/include/gtest/gtest.h \
$(gtest_top)/include/gtest/gtest-printers.h \
$(gtest_top)/include/gtest/gtest-typed-test.h \
$(gtest_top)/include/gtest/gtest-matchers.h \
$(gtest_top)/include/gtest/gtest-message.h \
$(gtest_top)/include/gtest/gtest_prod.h \
$(gtest_top)/include/gtest/gtest-param-test.h \
$(gtest_top)/include/gtest/gtest-spi.h \
$(gtest_top)/include/gtest/internal/gtest-death-test-internal.h \
$(gtest_top)/include/gtest/internal/gtest-port-arch.h \
$(gtest_top)/include/gtest/internal/gtest-filepath.h \
$(gtest_top)/include/gtest/internal/gtest-port.h \
$(gtest_top)/include/gtest/internal/gtest-internal.h \
$(gtest_top)/include/gtest/internal/gtest-string.h \
$(gtest_top)/include/gtest/internal/gtest-type-util.h \
$(gtest_top)/include/gtest/internal/gtest-param-util.h \
$(gtest_top)/include/gtest/internal/custom/gtest.h \
$(gtest_top)/include/gtest/internal/custom/gtest-printers.h \
$(gtest_top)/include/gtest/internal/custom/gtest-port.h

COMMON_CXXFLAGS = $(PROJECT_CFLAGS) $(PROJECT_WXXFLAGS) $(BOOST_CPPFLAGS)

COMMON_CXXFLAGS = $(PROJECT_WXXFLAGS) $(BOOST_CPPFLAGS) \
$(PROJECT_TEST_CFLAGS)
COMMON_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
-isystem $(top_srcdir)/$(gtest_top)/include
COMMON_LIBS = $(PROJECT_LIBS) libgtest.la
$(PROJECT_TEST_LIBS)
COMMON_LIBS = $(PROJECT_TEST_LIBS)

check_PROGRAMS = \
tests/test_tuple_cat \
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MM_ARG_ENABLE_DOCUMENTATION
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST([LIBMURRAYC_TUPLE_UTILS_SO_VERSION], [0:0:0])

#PKG_CHECK_MODULES([PROJECT], [])
PKG_CHECK_MODULES([PROJECT_TESTS], [gtest_main])

AC_LANG([C++])
MM_ARG_ENABLE_WARNINGS([PROJECT_WXXFLAGS],
Expand Down
1 change: 0 additions & 1 deletion googletest
Submodule googletest deleted from 703bd9