diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-02-05 12:41:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-05 12:41:02 +0100 |
| commit | ce83abc166015eab8a49ff9706c101dd8d5552a3 (patch) | |
| tree | 687afe9e3d2c37726f4d35635fbb583e7af8b58e /test/unit | |
| parent | 2e6dde7a7eae34b8f93c078480db077891f03068 (diff) | |
| parent | 49123c6767e6aff55701b21fa7256ae09b0b0b73 (diff) | |
| download | PROJ-ce83abc166015eab8a49ff9706c101dd8d5552a3.tar.gz PROJ-ce83abc166015eab8a49ff9706c101dd8d5552a3.zip | |
Merge pull request #1246 from QuLogic/external-deps
Improve checks for external deps
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | test/unit/Makefile.am | 16 |
2 files changed, 21 insertions, 8 deletions
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index a157f630..86e3484a 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -1,5 +1,16 @@ # CMake configuration for PROJ unit tests +option(USE_EXTERNAL_GTEST "Compile against external GTest" OFF) + +if (USE_EXTERNAL_GTEST) + +message(STATUS "Using external GTest") +find_package(GTest 1.8.0) + +else (USE_EXTERNAL_GTEST) + +message(STATUS "Using internal GTest") + # FIXME: Deal with our old-school CMakeLists.txt behaving badly set(_save_c_flags "${CMAKE_C_FLAGS}") set(_save_cxx_flags "${CMAKE_CXX_FLAGS}") @@ -47,6 +58,8 @@ set(CMAKE_CXX_FLAGS "${_save_cxx_flags}") unset(_save_c_flags) unset(_save_cxx_flags) +endif(USE_EXTERNAL_GTEST) + # # Build PROJ unit tests # diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index 34624b0d..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_FLAGS@ +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_LDFLAGS@ +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_LDFLAGS@ +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 |