Update GoogleTest to latest version (#257)

* Remove old gtest version * Add new vendored Googletest version * Move test_config H to HH * CMake updates for new googletest version * Test updates for new googletest version Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Jun 28, 2022 · 7cf04fc · 7cf04fc
1 parent 14f6fd3
commit 7cf04fc
Show file tree

Hide file tree

Showing 60 changed files with 11,427 additions and 20,770 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,9 @@ find_package(gz-cmake3 REQUIRED)
 #============================================================================
 # Configure the project
 #============================================================================
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 gz_configure_project(
   REPLACE_IGNITION_INCLUDE_PATH gz/msgs
   VERSION_SUFFIX pre1)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -180,7 +180,7 @@ gz_create_core_library(SOURCES
   ${PROJECT_SOURCE_DIR}/src/Filesystem.cc
   ${PROJECT_SOURCE_DIR}/src/gz.cc
   ${PROJECT_SOURCE_DIR}/src/Utility.cc
-  CXX_STANDARD 17)
+)
 
 target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
   PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

diff --git a/src/Factory_TEST.cc b/src/Factory_TEST.cc
@@ -19,9 +19,9 @@
 #include <algorithm>
 #include <cstddef>
 
-#include "gz/msgs/test_config.h"
 #include "gz/msgs/MessageTypes.hh"
 #include "gz/msgs/Factory.hh"
+#include "test_config.hh"
 
 using namespace gz;
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,24 +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
+  ${PROJECT_BINARY_DIR}/include
 )
 
-configure_file (test_config.h.in
-  ${PROJECT_BINARY_DIR}/include/gz/msgs/test_config.h)
-
-# Build gtest
-add_library(gtest STATIC gtest/src/gtest-all.cc)
-target_compile_features(gtest PUBLIC cxx_variadic_macros)
-add_library(gtest_main STATIC gtest/src/gtest_main.cc)
-target_link_libraries(gtest_main gtest)
-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})
-
+add_subdirectory(gtest_vendor)
 add_subdirectory(integration)
 add_subdirectory(performance)
 add_subdirectory(regression)
diff --git a/test/gtest/cmake/internal_utils.cmake b/test/gtest/cmake/internal_utils.cmake
diff --git a/test/gtest/gtest-20180605-98a0d007d70.diff b/test/gtest/gtest-20180605-98a0d007d70.diff