diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2019-02-03 02:57:38 -0500 |
|---|---|---|
| committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2019-02-04 05:24:04 -0500 |
| commit | 561a6639c45a4e35a638c2e87869c5991fc7d69e (patch) | |
| tree | 16046d9063c32e8bdf40b216e35e3c4a41829fdd /test | |
| parent | 322493235696097b94294f5f466a32f015a95626 (diff) | |
| download | PROJ-561a6639c45a4e35a638c2e87869c5991fc7d69e.tar.gz PROJ-561a6639c45a4e35a638c2e87869c5991fc7d69e.zip | |
Allow building against external GTest with autotools.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 5 | ||||
| -rw-r--r-- | test/unit/Makefile.am | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index b65e9785..fa2c1e80 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -7,4 +7,7 @@ EXTRA_DIST = CMakeLists.txt # libtestmain_la_LDFLAGS = -no-undefined # libtestmain_la_SOURCES = test_main.cpp -SUBDIRS = cli googletest . gie gigs unit +if !USE_EXTERNAL_GTEST +MAYBE_GTEST = googletest +endif +SUBDIRS = cli $(MAYBE_GTEST) . gie gigs unit diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index c0a05997..210bdc90 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = CMakeLists.txt noinst_HEADERS = gtest_include.h -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/test -I$(top_srcdir)/test/googletest/include @SQLITE3_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/test @GTEST_CFLAGS@ @SQLITE3_CFLAGS@ AM_CXXFLAGS = @CXX_WFLAGS@ @NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG@ PROJ_LIB ?= ../../data @@ -19,43 +19,43 @@ noinst_PROGRAMS += gie_self_tests noinst_PROGRAMS += include_proj_h_from_c pj_transform_test_SOURCES = pj_transform_test.cpp main.cpp -pj_transform_test_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la +pj_transform_test_LDADD = ../../src/libproj.la @GTEST_LIBS@ pj_transform_test-check: pj_transform_test PROJ_LIB=$(PROJ_LIB) ./pj_transform_test pj_phi2_test_SOURCES = pj_phi2_test.cpp main.cpp -pj_phi2_test_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la +pj_phi2_test_LDADD = ../../src/libproj.la @GTEST_LIBS@ pj_phi2_test-check: pj_phi2_test ./pj_phi2_test proj_errno_string_test_SOURCES = proj_errno_string_test.cpp main.cpp -proj_errno_string_test_LDADD= ../../src/libproj.la ../../test/googletest/libgtest.la +proj_errno_string_test_LDADD= ../../src/libproj.la @GTEST_LIBS@ proj_errno_string_test-check: proj_errno_string_test ./proj_errno_string_test proj_angular_io_test_SOURCES = proj_angular_io_test.cpp main.cpp -proj_angular_io_test_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la +proj_angular_io_test_LDADD = ../../src/libproj.la @GTEST_LIBS@ proj_angular_io_test-check: proj_angular_io_test ./proj_angular_io_test proj_context_test_SOURCES = proj_context_test.cpp main.cpp -proj_context_test_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la +proj_context_test_LDADD = ../../src/libproj.la @GTEST_LIBS@ proj_context_test-check: proj_context_test ./proj_context_test test_cpp_api_SOURCES = test_util.cpp test_common.cpp test_crs.cpp test_metadata.cpp test_io.cpp test_operation.cpp test_datum.cpp test_factory.cpp test_c_api.cpp main.cpp -test_cpp_api_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la @SQLITE3_LIBS@ +test_cpp_api_LDADD = ../../src/libproj.la @GTEST_LIBS@ @SQLITE3_LIBS@ test_cpp_api-check: test_cpp_api PROJ_LIB=$(PROJ_LIB) ./test_cpp_api gie_self_tests_SOURCES = gie_self_tests.cpp main.cpp -gie_self_tests_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la @SQLITE3_LIBS@ +gie_self_tests_LDADD = ../../src/libproj.la @GTEST_LIBS@ @SQLITE3_LIBS@ gie_self_tests-check: gie_self_tests PROJ_LIB=$(PROJ_LIB) ./gie_self_tests |