COMP: Replace CIBC-Internal/googletest with google/googletest v1.15.2

The old ExternalProject setup fetched an ancient fork
(CIBC-Internal/googletest, branch "origin/cleaver") whose
cmake_minimum_required predates 3.5, which CMake >= 4.0 rejects.

Replace with FetchContent from google/googletest v1.15.2 and use
the modern CMake targets (GTest::gtest_main, GTest::gmock). This
eliminates 117 lines of manual library path handling, platform-
specific linking workarounds, and the copy_deps ExternalProject step.

Author: hjmjohnson

src/test/CMakeLists.txt

@@ -1,129 +1,23 @@
-# gtest external download
-set(EXTERNAL_DIR "${CLEAVER2_BINARY_DIR}/externals")
-set(GTEST_INSTALL_DIR "${EXTERNAL_DIR}/googletest")
-if(WIN32)
-  set(GTEST_SHARED_ARG ON)
-else()
-  set(GTEST_SHARED_ARG OFF)
-endif()
-
-include(ExternalProject)
-
-set(googletest_GIT_TAG "origin/cleaver")
-
-set(debug_suffix )
-if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-  set(debug_suffix d)
-endif()
-
-set(_ep_arg_build_byproducts)
-if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
-  set(_build_byproducts "")
-  if(WIN32)
-    foreach(_lib IN ITEMS gtest gtest_main gmock gmock_main)
-      list(APPEND _build_byproducts
-        ${GTEST_INSTALL_DIR}/lib/lib/${CMAKE_FIND_LIBRARY_PREFIXES}${_lib}${debug_suffix}${CMAKE_STATIC_LIBRARY_SUFFIX})
-    endforeach()
-  else()
-    foreach(_lib IN ITEMS gtest gtest_main gmock gmock_main)
-      list(APPEND _build_byproducts ${GTEST_INSTALL_DIR}/lib/lib/${CMAKE_FIND_LIBRARY_PREFIXES}${_lib}${debug_suffix}${CMAKE_STATIC_LIBRARY_SUFFIX})
-    endforeach()
-  endif()
-  set(_ep_arg_build_byproducts BUILD_BYPRODUCTS ${_build_byproducts})
-endif()
-
-set(_cmake_cache_args)
-if(DEFINED CMAKE_BUILD_TYPE)
-  list(APPEND _cmake_cache_args -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
-endif()
-ExternalProject_Add(googletest
-   PREFIX "${GTEST_INSTALL_DIR}"
-   GIT_REPOSITORY "https://github.com/CIBC-Internal/googletest.git"
-   GIT_TAG ${googletest_GIT_TAG}
-   CMAKE_CACHE_ARGS
-     ${_cmake_cache_args}
-   INSTALL_DIR "${GTEST_INSTALL_DIR}/include"
-   BINARY_DIR "${GTEST_INSTALL_DIR}/lib"
-   INSTALL_COMMAND ""
-   ${_ep_arg_build_byproducts}
-   CMAKE_ARGS
-    -DCMAKE_CXX_FLAGS=-Wno-error=maybe-uninitialized
-    -DCMAKE_C_FLAGS=-Wno-error=maybe-uninitialized
-)
-
-# Copy and Specify Include Directory
-ExternalProject_Get_Property(googletest source_dir)
-ExternalProject_Add_Step(
-   googletest
-   copy_deps
-   COMMAND ${CMAKE_COMMAND} -E copy_directory ${source_dir}/googletest/include ${GTEST_INSTALL_DIR}/include
-   COMMAND ${CMAKE_COMMAND} -E copy_directory ${source_dir}/googlemock/include ${GTEST_INSTALL_DIR}/include
-   DEPENDEES install
+# Fetch googletest via FetchContent (replaces CIBC-Internal/googletest ExternalProject)
+include(FetchContent)
+FetchContent_Declare(
+  googletest
+  GIT_REPOSITORY https://github.com/google/googletest.git
+  GIT_TAG v1.15.2
 )
-include_directories("${GTEST_INSTALL_DIR}/include")
-
-# Set up library paths
-set(GTEST_LIBRARY gtest)
-add_library(${GTEST_LIBRARY} UNKNOWN IMPORTED)
-ExternalProject_Get_Property(googletest binary_dir)
-if(NOT WIN32)
-  set(GTEST_LIBRARY_PATH_OTHER ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${debug_suffix}${CMAKE_STATIC_LIBRARY_SUFFIX})
-  set_target_properties(${GTEST_LIBRARY} PROPERTIES IMPORTED_LOCATION ${GTEST_LIBRARY_PATH_OTHER})
-endif()
-add_dependencies(${GTEST_LIBRARY} googletest)
-
-set(GTEST_MAIN_LIBRARY gtest_main)
-add_library(${GTEST_MAIN_LIBRARY} UNKNOWN IMPORTED)
-if(NOT WIN32)
-  set(GTEST_MAIN_LIBRARY_PATH_OTHER ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${debug_suffix}${CMAKE_STATIC_LIBRARY_SUFFIX})
-  set_target_properties(${GTEST_MAIN_LIBRARY} PROPERTIES IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH_OTHER})
-endif()
-add_dependencies(${GTEST_MAIN_LIBRARY} googletest)
-
-set(GMOCK_LIBRARY gmock)
-add_library(${GMOCK_LIBRARY} UNKNOWN IMPORTED)
-if(NOT WIN32)
-  set(GMOCK_LIBRARY_PATH_OTHER ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock${debug_suffix}${CMAKE_STATIC_LIBRARY_SUFFIX})
-  set_target_properties(${GMOCK_LIBRARY} PROPERTIES IMPORTED_LOCATION ${GMOCK_LIBRARY_PATH_OTHER})
-endif()
-add_dependencies(${GMOCK_LIBRARY} googletest)
-
-set(GMOCK_MAIN_LIBRARY gmock_main)
-add_library(${GMOCK_MAIN_LIBRARY} UNKNOWN IMPORTED)
-if(NOT WIN32)
-  set(GMOCK_MAIN_LIBRARY_PATH_OTHER ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock_main${debug_suffix}${CMAKE_STATIC_LIBRARY_SUFFIX})
-  set_target_properties(${GMOCK_MAIN_LIBRARY} PROPERTIES IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARY_PATH_OTHER})
-endif()
-add_dependencies(${GMOCK_MAIN_LIBRARY} ${GTEST_LIBRARY})
-
+# Prevent googletest from overriding our compiler/linker options
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
 
 # Definitions for Tests
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CLEAVER2_BINARY_DIR}/test/bin)
-#test macro
+
+# test macro
 function(NEWTEST name)
   add_executable(${name} ${name}.cpp ${ARGN})
-  if(NOT WIN32)
-    target_link_libraries(${name} ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY} ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY} cleaver -lpthread)
-  else ()
-    if (CMAKE_CONFIGURATION_TYPES)
-      target_link_libraries(${name}
-         ${binary_dir}/lib/$<CONFIG>/${CMAKE_FIND_LIBRARY_PREFIXES}gtest$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
-         ${binary_dir}/lib/$<CONFIG>/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
-         ${binary_dir}/lib/$<CONFIG>/${CMAKE_FIND_LIBRARY_PREFIXES}gmock$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
-         ${binary_dir}/lib/$<CONFIG>/${CMAKE_FIND_LIBRARY_PREFIXES}gmock_main$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
-          cleaver )
-    else()
-      # Ninja
-      target_link_libraries(${name}
-       ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
-       ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
-       ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
-       ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock_main$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
-          cleaver )
-    endif()
-  endif()
-  add_test(${name} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name})
-  add_dependencies(${name} gtest gtest_main cleaver)
+  target_link_libraries(${name} GTest::gtest_main GTest::gmock cleaver)
+  add_test(NAME ${name} COMMAND ${name})
 endfunction()
 
 add_subdirectory(cleaver)