diff --git a/test/unittests/CMakeLists.txt b/test/unittests/CMakeLists.txt index f0291a0..7ab3278 100644 --- a/test/unittests/CMakeLists.txt +++ b/test/unittests/CMakeLists.txt @@ -1,31 +1,7 @@ if (NOT BUILD_TESTING) return() endif() - -# current latest GTEST version -set(OVPN_GTEST_VERSION release-1.11.0) -# use an older version of gtest for GCC < 5.1.0; 1.10.1 is the latest -# version that works with the 4.8.x compilers -if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1.0) - set(OVPN_GTEST_VERSION release-1.10.0) - # Note: not all the test compilation units hit the - # "'is_trivially_copy_constructible' is not a member of 'std'" - # issue; only the following do (with line number as of this - # writing and the include on the line): - # core_tests.cpp:21: // #include - # test_b64.cpp:22: // #include "test_common.h" - # test_comp.cpp:45: // #include "test_common.h" - # test_log.cpp:22: // #include "test_common.h" - # test_route_emulation.cpp:23: // #include "test_common.h" - # test_verify_x509_name.cpp:25: // #include "test_common.h" - # - # Note further: test_common.h includes gtest/gtest.h; but that is - # not a sufficient condition to hit the bust. For example, - # test_continuation.cpp includes test_common.h but does not manifest - # the issue. -endif() - -include(dlgoogletest) +FIND_LIBRARY(GTEST_LIB NAMES gtest) set(CORE_TEST_DEFINES -DOPENVPN_FORCE_TUN_NULL