]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Update to GoogleTest 1.16.0.
authorVladislav Shchapov <vladislav@shchapov.ru>
Fri, 9 Jan 2026 20:02:11 +0000 (01:02 +0500)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Sun, 11 Jan 2026 09:32:39 +0000 (10:32 +0100)
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>
test/CMakeLists.txt

index 9a2342a37918b7fdd94794375d3b2e78877991e8..a0e04511cb800bd70c2c2fc1b7c2526d9b3897cd 100644 (file)
@@ -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()