Update GoogleTest to latest version

CMakeLists.txt

@@ -14,8 +14,9 @@ find_package(gz-cmake3 REQUIRED)
 #============================================================================
 # Configure the project
 #============================================================================
-set (c++standard 17)
-set (CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 gz_configure_project(
   REPLACE_IGNITION_INCLUDE_PATH gz/math
   VERSION_SUFFIX pre1)

src/CMakeLists.txt

@@ -4,7 +4,7 @@
 gz_get_libsources_and_unittests(sources gtest_sources)
 
 # Create the library target
-gz_create_core_library(SOURCES ${sources} CXX_STANDARD ${c++standard})
+gz_create_core_library(SOURCES ${sources} CXX_STANDARD ${CMAKE_CXX_STANDARD})
 
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC

src/Color_TEST.cc

@@ -419,10 +419,3 @@ TEST(Color, HSV)
   EXPECT_NEAR(clr.B(), 0.3f, 1e-3);
   EXPECT_NEAR(clr.A(), 1.0, 1e-3);
 }
-
-/////////////////////////////////////////////////
-int main(int argc, char **argv)
-{
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}

src/MovingWindowFilter_TEST.cc

@@ -68,9 +68,3 @@ TEST(MovingWindowFilterTest, FilterSomething)
         3.0*static_cast<double>(i));
   EXPECT_EQ(vectorMWF.Value(), vsum / 20.0);
 }
-
-int main(int argc, char **argv)
-{
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}

src/SemanticVersion_TEST.cc

@@ -207,11 +207,3 @@ TEST(SemVerTest, Constructor)
   EXPECT_TRUE(a.Prerelease().empty());
   EXPECT_TRUE(a.Build().empty());
 }
-
-/////////////////////////////////////////////////
-int main(int argc, char **argv)
-{
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-

src/Temperature_TEST.cc

@@ -188,10 +188,3 @@ TEST(TemperatureTest, Negative)
   Temperature temp5 = 2.0 / temp3;
   EXPECT_NEAR(temp5.Kelvin(), 2.0, 1e-6);
 }
-
-/////////////////////////////////////////////////
-int main(int argc, char **argv)
-{
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}

src/graph/Edge_TEST.cc

@@ -35,7 +35,7 @@ class EdgeTestFixture : public testing::Test
 // The list of edges we want to test.
 using EdgeTypes = ::testing::Types<DirectedEdge<int>,
                                    UndirectedEdge<int>>;
-TYPED_TEST_CASE(EdgeTestFixture, EdgeTypes);
+TYPED_TEST_SUITE(EdgeTestFixture, EdgeTypes, );
 
 /////////////////////////////////////////////////
 TYPED_TEST(EdgeTestFixture, Accessors)

src/graph/GraphAlgorithms_TEST.cc

@@ -33,7 +33,7 @@ class GraphTestFixture : public testing::Test
 // The list of graphs we want to test.
 using GraphTypes = ::testing::Types<DirectedGraph<int, double>,
                                     UndirectedGraph<int, double>>;
-TYPED_TEST_CASE(GraphTestFixture, GraphTypes);
+TYPED_TEST_SUITE(GraphTestFixture, GraphTypes, );
 
 /////////////////////////////////////////////////
 TYPED_TEST(GraphTestFixture, BreadthFirstSort)

src/graph/Graph_TEST.cc

@@ -55,7 +55,7 @@ class MockEdgesFullUndirectedGraph : public UndirectedGraph<V, E>
 // The list of graphs we want to test.
 using GraphTypes = ::testing::Types<DirectedGraph<int, double>,
                                     UndirectedGraph<int, double>>;
-TYPED_TEST_CASE(GraphTestFixture, GraphTypes);
+TYPED_TEST_SUITE(GraphTestFixture, GraphTypes, );
 
 /////////////////////////////////////////////////
 TYPED_TEST(GraphTestFixture, UniformInitialization)

src/ruby/CMakeLists.txt

@@ -63,7 +63,6 @@ if (RUBY_FOUND)
     gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER}
     gz-math${PROJECT_VERSION_MAJOR}
   )
-  target_compile_features(${SWIG_RB_LIB} PUBLIC ${IGN_CXX_${c++standard}_FEATURES})
 
   set_target_properties(${SWIG_RB_LIB}
     PROPERTIES

test/CMakeLists.txt

@@ -1,25 +1,10 @@
+configure_file (test_config.hh.in
+  ${PROJECT_BINARY_DIR}/include/test_config.hh
+)
 include_directories (
-  ${PROJECT_SOURCE_DIR}/test/gtest/include
-  ${PROJECT_SOURCE_DIR}/test/gtest
-  ${PROJECT_SOURCE_DIR}/test
-  ${CMAKE_BINARY_DIR}/include
+  ${PROJECT_BINARY_DIR}/include
 )
 
-configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/test_config.h)
-
-# Build gtest
-add_library(gtest STATIC gtest/src/gtest-all.cc)
-add_library(gtest_main STATIC gtest/src/gtest_main.cc)
-target_link_libraries(gtest_main gtest)
-set_property(TARGET gtest_main PROPERTY CXX_STANDARD ${c++standard})
-set_property(TARGET gtest PROPERTY CXX_STANDARD ${c++standard})
-set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a")
-set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a")
-
-execute_process(COMMAND cmake -E remove_directory ${CMAKE_BINARY_DIR}/test_results)
-execute_process(COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test_results)
-include_directories(${GTEST_INCLUDE_DIRS})
-
 #============================================================================
 # Do a fake install of ign-math in order to test the examples.
 #============================================================================
@@ -41,6 +26,7 @@ ExternalProject_Add(
     "-DCMAKE_INSTALL_PREFIX=${FAKE_INSTALL_PREFIX}"
 )
 
+add_subdirectory(gtest_vendor)
 add_subdirectory(integration)
 add_subdirectory(performance)
 add_subdirectory(regression)