iox-eclipse-iceoryx#841 Upgrade GTest/GMock to v1.10

ApexAI · Jan 11, 2022 · faec877 · faec877
1 parent a41fd66
commit faec877
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@
 - Make `cxx::string::capacity` a `static` method[\#979](https://github.com/eclipse-iceoryx/iceoryx/issues/979)
 - Restructure iceoryx tools [\#471](https://github.com/eclipse-iceoryx/iceoryx/issues/471)
 - Use cxx::expected for MemoryManager::getChunk [\#954](https://github.com/eclipse-iceoryx/iceoryx/pull/991)
+- Upgrade GTest/GMock to v1.10 [\#841](https://github.com/eclipse-iceoryx/iceoryx/issues/841)
 
 **API Breaking Changes:**
 

diff --git a/cmake/googletest/0001-remove-werror-from-build-flags.patch b/cmake/googletest/0001-remove-werror-from-build-flags.patch
@@ -1,8 +1,15 @@
 --- /googletest/cmake/internal_utils.cmake
 +++ /googletest/cmake/internal_utils.cmake.new
-@@ -99,7 +99,7 @@
-     set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0")
-     set(cxx_no_rtti_flags "-GR-")
+@@ -82,13 +82,13 @@ macro(config_compiler_and_linker)
+     # http://stackoverflow.com/questions/3232669 explains the issue.
+     set(cxx_base_flags "${cxx_base_flags} -wd4702")
+   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+-    set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
++    set(cxx_base_flags "-Wall -Wshadow -Wconversion")
+     set(cxx_exception_flags "-fexceptions")
+     set(cxx_no_exception_flags "-fno-exceptions")
+     set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
+     set(cxx_no_rtti_flags "-fno-rtti")
    elseif (CMAKE_COMPILER_IS_GNUCXX)
 -    set(cxx_base_flags "-Wall -Wshadow -Werror")
 +    set(cxx_base_flags "-Wall -Wshadow")

diff --git a/cmake/googletest/googletest.cmake.in b/cmake/googletest/googletest.cmake.in
@@ -19,26 +19,13 @@ cmake_minimum_required(VERSION 3.5)
 project(googletest-download NONE)
 
 include(ExternalProject)
-if(WIN32)
-    ExternalProject_Add(googletest
-      GIT_REPOSITORY    https://github.com/google/googletest.git
-      GIT_TAG           release-1.10.0
-      SOURCE_DIR        "${CMAKE_BINARY_DIR}/dependencies/googletest/src"
-      BINARY_DIR        "${CMAKE_BINARY_DIR}/dependencies/googletest/build"
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND     ""
-      INSTALL_COMMAND   ""
-      TEST_COMMAND      ""
-    )
-else()
-    ExternalProject_Add(googletest
-      GIT_REPOSITORY    https://github.com/google/googletest.git
-      GIT_TAG           release-1.8.1
-      SOURCE_DIR        "${CMAKE_BINARY_DIR}/dependencies/googletest/src"
-      BINARY_DIR        "${CMAKE_BINARY_DIR}/dependencies/googletest/build"
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND     ""
-      INSTALL_COMMAND   ""
-      TEST_COMMAND      ""
-    )
-endif(WIN32)
+ExternalProject_Add(googletest
+    GIT_REPOSITORY    https://github.com/google/googletest.git
+    GIT_TAG           release-1.10.0
+    SOURCE_DIR        "${CMAKE_BINARY_DIR}/dependencies/googletest/src"
+    BINARY_DIR        "${CMAKE_BINARY_DIR}/dependencies/googletest/build"
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND     ""
+    INSTALL_COMMAND   ""
+    TEST_COMMAND      ""
+)