[C] Bump GoogleTest to 1.14.0.

Author: vyazelenko

CMakeLists.txt

@@ -16,13 +16,15 @@
 
 cmake_minimum_required(VERSION 3.30 FATAL_ERROR)
 cmake_policy(VERSION 3.30)
+cmake_policy(SET CMP0003 NEW)
+cmake_policy(SET CMP0135 NEW)
 
 file(STRINGS version.txt SBE_VERSION_TXT LIMIT_COUNT 1 REGEX "^[0-9]+(\\.[0-9]+)+")
 string(REGEX REPLACE "^([0-9]+(\\.[0-9]+)+).*$" "\\1" SBE_VERSION_NUMERIC "${SBE_VERSION_TXT}")
 
 project("sbe" VERSION "${SBE_VERSION_NUMERIC}")
 
-include(ExternalProject)
+include(FetchContent)
 include(CheckLibraryExists)
 
 if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
@@ -63,36 +65,12 @@ if (NOT DEFINED CMAKE_C_EXTENSIONS)
 endif ()
 
 if (SBE_TESTS)
-    set(SBE_THIRDPARTY_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty")
-
-    ExternalProject_Add(
-        gtest
-        URL ${CMAKE_CURRENT_SOURCE_DIR}/cppbuild/googletest-release-1.12.1.zip
-        URL_MD5 2648d4138129812611cf6b6b4b497a3b
-        PREFIX "${SBE_THIRDPARTY_BINARY_DIR}/gtest"
-        CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER};-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-        BUILD_BYPRODUCTS "${SBE_THIRDPARTY_BINARY_DIR}/gtest/src/gtest-build/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX};${SBE_THIRDPARTY_BINARY_DIR}/gtest/src/gtest-build/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
-        INSTALL_COMMAND ""
-        LOG_CONFIGURE ON
-        LOG_BUILD ON
-    )
-
-    ExternalProject_Get_Property(gtest source_dir)
-    set(GTEST_SOURCE_DIR ${source_dir})
-    ExternalProject_Get_Property(gtest binary_dir)
-    set(GTEST_BINARY_DIR ${binary_dir})
-
-    if (MSVC AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-        set(GTEST_POSTFIX "d")
-    else ()
-        set(GTEST_POSTFIX "")
-    endif ()
+    FetchContent_Declare(
+            gmock
+            URL ${CMAKE_CURRENT_SOURCE_DIR}/cppbuild/googletest-1.14.0.zip
+            URL_MD5 b4911e882c51cba34bebfb5df500a650)
 
-    set(GTEST_LIBS
-        ${GTEST_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}
-        ${GTEST_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
-        ${GTEST_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
-    )
+    FetchContent_MakeAvailable(gmock)
 endif ()
 
 find_package(Threads)
@@ -132,6 +110,8 @@ elseif (MSVC)
 
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /Od /Zi /MP")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /MP")
+    set(CMAKE_C_FLAGS_DEBUG "/MTd")
+    set(CMAKE_C_FLAGS_RELEASE "/MT")
 
     if (C_WARNINGS_AS_ERRORS)
         add_compile_options($<$<COMPILE_LANGUAGE:C>:/WX>)

cppbuild/googletest-1.14.0.zip

@@ -16,16 +16,15 @@
 
 function(sbe_test name)
     add_executable("C${name}" "${name}.cpp")
+    add_dependencies(C${name} gmock)
     target_include_directories("C${name}"
-        PRIVATE ${GTEST_SOURCE_DIR}/googletest/include
-        PRIVATE ${C_CODEC_TARGET_DIR}
+            PRIVATE ${C_CODEC_TARGET_DIR}
     )
     target_compile_options("C${name}" PRIVATE $<$<CXX_COMPILER_ID:AppleClang>:-Werror>)
     target_compile_options("C${name}" PRIVATE $<$<CXX_COMPILER_ID:Clang>:-Werror>)
     target_compile_options("C${name}" PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Werror -Wno-maybe-uninitialized>)
-    target_link_libraries("C${name}" ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries("C${name}" gmock_main ${CMAKE_THREAD_LIBS_INIT})
     add_test(NAME C${name} COMMAND C${name} WORKING_DIRECTORY ${C_CODEC_TARGET_DIR})
-    add_dependencies(C${name} gtest)
     if (${ARGC} GREATER 1)
         add_dependencies(C${name} ${ARGV1})
     endif ()

cppbuild/googletest-release-1.12.1.zip

@@ -16,17 +16,15 @@
 
 function(sbe_test name)
     add_executable("${name}" "${name}.cpp")
+    add_dependencies(${name} gmock)
     target_include_directories("${name}"
-        PRIVATE ${GTEST_SOURCE_DIR}/googletest/include
-        PRIVATE ${GTEST_SOURCE_DIR}/googlemock/include
         PRIVATE ${CXX_CODEC_TARGET_DIR}
     )
     target_compile_options("${name}" PRIVATE $<$<CXX_COMPILER_ID:AppleClang>:-Werror>)
     target_compile_options("${name}" PRIVATE $<$<CXX_COMPILER_ID:Clang>:-Werror>)
     target_compile_options("${name}" PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Werror>)
-    target_link_libraries("${name}" sbe ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries("${name}" sbe gmock_main ${CMAKE_THREAD_LIBS_INIT})
     add_test(NAME ${name} COMMAND ${name} WORKING_DIRECTORY ${CXX_CODEC_TARGET_DIR})
-    add_dependencies(${name} gtest)
     if (${ARGC} GREATER 1)
         add_dependencies(${name} ${ARGV1})
     endif ()