From: Vladislav Shchapov <vladislav@shchapov.ru>
Date: Fri, 9 Jan 2026 20:02:11 +0000 (+0500)
Subject: Update to GoogleTest 1.16.0.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=298f65952faf958b4664bd5be8d816e9599fb7cb;p=thirdparty%2Fzlib-ng.git

Update to GoogleTest 1.16.0.
This requires minimum CMake 3.13 and C++14, this matches nicely with zlib-ng 2.3.x requirements.

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
---

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9a2342a37..a0e04511c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -94,7 +94,12 @@ endif()
 if(WITH_GTEST)
     # Google test requires at least C++11
     if(NOT DEFINED CMAKE_CXX_STANDARD)
-        set(CMAKE_CXX_STANDARD 11)
+        # Use older version of Google test to support older versions of GCC
+        if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.3)
+            set(CMAKE_CXX_STANDARD 11)
+        else()
+            set(CMAKE_CXX_STANDARD 14)
+        endif()
     endif()
 
     # Google test requires MSAN instrumented LLVM C++ libraries
@@ -126,7 +131,7 @@ if(WITH_GTEST)
             if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.3)
                 set(GTEST_TAG release-1.10.0)
             else()
-                set(GTEST_TAG release-1.12.1)
+                set(GTEST_TAG v1.16.0)
             endif()
         endif()