Merge pull request #66 from thexai/GoogleTest-1.13.0

Bump GoogleTest to 1.17.0

Author: thexai

CMakeLists.txt

@@ -542,15 +542,18 @@ add_dependency_project_package(shairplay 096b61a)
 endif()
 
 ExternalProject_Add(GoogleTest
-    GIT_REPOSITORY https://github.com/Google/GoogleTest
-    GIT_TAG 703bd9caab50b139428cea1aaff9974ebee5742e
-    GIT_SHALLOW ON
+    DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
+    URL https://github.com/google/googletest/releases/download/v1.17.0/googletest-1.17.0.tar.gz
+    URL_HASH SHA256=65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c
+    PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
     CMAKE_ARGS
         ${ADDITIONAL_ARGS}
         -Dgtest_force_shared_crt:BOOL=ON
+        -DBUILD_GMOCK:BOOL=OFF
+        -DCMAKE_DEBUG_POSTFIX=d
         -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
 )
-add_dependency_project_package(GoogleTest 1.10.0)
+add_dependency_project_package(GoogleTest 1.17.0)
 
 add_custom_target(DependenciesRequired
     DEPENDS

patches/GoogleTest.diff

@@ -0,0 +1,23 @@
+diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
+index 7ca256a7..40631be1 100644
+--- a/googletest/cmake/internal_utils.cmake
++++ b/googletest/cmake/internal_utils.cmake
+@@ -75,7 +75,7 @@ macro(config_compiler_and_linker)
+     # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
+     set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J")
+     set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
+-    set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
++    set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN -D_USE_STD_VECTOR_ALGORITHMS=0")
+     set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
+     set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0")
+     set(cxx_no_rtti_flags "-GR-")
+@@ -173,8 +173,7 @@ function(cxx_library_with_type name type cxx_flags)
+     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+     ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+-    PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+-    COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
++    PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+   # Make PDBs match library name.
+   get_target_property(pdb_debug_postfix ${name} DEBUG_POSTFIX)
+   set_target_properties(${name}