Updated googletest to release-1.12.1 and catch2 to v3.3.2

cpp/CMakeLists.txt

@@ -8,13 +8,16 @@ include(FetchContent)
 FetchContent_Declare(
   googletest
   GIT_REPOSITORY https://github.com/google/googletest.git
-  GIT_TAG release-1.8.1
+  GIT_TAG release-1.12.1
 )
 
-# Fetch GoogleTest amd make build scripts available
-if (NOT googletest_POPULATED)
-  FetchContent_Populate(googletest)
-endif()
+FetchContent_Declare(
+  catch2 
+  GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+  GIT_TAG v3.3.2
+)
+
+FetchContent_MakeAvailable(googletest catch2)
 
 #set(gtest_force_shared_crt OFF CACHE BOOL "" FORCE)
 # Force Google Test to link the C/C++ runtimes dynamically when
@@ -25,9 +28,6 @@ if (MSVC)
   set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 endif()
 
-# Bring the populated content into the build
-add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
-
 # uncomment this line to enable coverage measurements using gcov
 # set(CMAKE_CXX_FLAGS "--coverage")