Modernize GoogleTest fetch (FetchContent v1.16.0), version 1.1.6

The legacy pre-FetchContent GoogleTest download mechanism
(configure_file test/CMakeLists.txt.in + execute_process git clone)
pinned googletest at an old release whose inner subdirectories use
`cmake_minimum_required(VERSION ...)` below the floor CMake 4 still
supports. Configures with CMake 4 now error out with:

    Compatibility with CMake < 3.5 has been removed from CMake.
    Update the VERSION argument <min> value.

Fix: replace the legacy mechanism with `FetchContent_Declare` pinned at
googletest v1.16.0. Delete test/CMakeLists.txt.in entirely.

Also wires googletest into the standard preset pattern:
- Root CMakeLists.txt: GOOGLETEST added to the graceful-fallback foreach
  alongside XMLPARSER, so a missing sibling silently falls back to
  remote.
- CMakePresets.json: `local` base now also overrides
  FETCHCONTENT_SOURCE_DIR_GOOGLETEST to ${sourceDir}/../googletest.

README updated: removed the stale note about GoogleTest using a legacy
non-overridable mechanism; sibling table now includes the googletest
override.

Project VERSION: 1.1.5 -> 1.1.6.

Author: vidanovic

CMakeLists.txt

@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 3.15)
 
-project( THMXParser VERSION 1.1.5 LANGUAGES CXX )
+project( THMXParser VERSION 1.1.6 LANGUAGES CXX )
 set(LIB_NAME ${PROJECT_NAME})
 
 # Graceful local-sibling fallback: the `local` CMake preset sets
 # FETCHCONTENT_SOURCE_DIR_<NAME> to ${sourceDir}/../<DepName> for each declared
 # dependency. If a sibling working copy is missing, unset that variable here so
 # FetchContent falls back to the declared remote instead of erroring out.
-foreach(_lbnl_dep XMLPARSER)
+foreach(_lbnl_dep XMLPARSER GOOGLETEST)
     if(DEFINED FETCHCONTENT_SOURCE_DIR_${_lbnl_dep})
         if(NOT EXISTS "${FETCHCONTENT_SOURCE_DIR_${_lbnl_dep}}/CMakeLists.txt")
             message(STATUS

CMakePresets.json

@@ -28,10 +28,11 @@
         {
             "name": "local",
             "hidden": true,
-            "description": "Base: prefers sibling working copies of dependencies (../XMLParser); falls back to remote per-dep when missing. Inherited by local-debug, local-release, and personal compiler presets.",
+            "description": "Base: prefers sibling working copies of dependencies (../XMLParser, ../googletest); falls back to remote per-dep when missing. Inherited by local-debug, local-release, and personal compiler presets.",
             "inherits": "default",
             "cacheVariables": {
-                "FETCHCONTENT_SOURCE_DIR_XMLPARSER": "${sourceDir}/../XMLParser"
+                "FETCHCONTENT_SOURCE_DIR_XMLPARSER": "${sourceDir}/../XMLParser",
+                "FETCHCONTENT_SOURCE_DIR_GOOGLETEST": "${sourceDir}/../googletest"
             }
         },
         {

README.md

@@ -17,7 +17,7 @@ include(FetchContent)
 FetchContent_Declare(
     THMXParser
     GIT_REPOSITORY https://github.com/LBNL-ETA/THMXParser.git
-    GIT_TAG v1.1.5
+    GIT_TAG v1.1.6
 )
 FetchContent_MakeAvailable(THMXParser)
 
@@ -52,10 +52,9 @@ ctest --test-dir build/default-release -C Release --output-on-failure
 | Dependency | Expected sibling path |
 |------------|----------------------|
 | XMLParser | `../XMLParser` |
+| GoogleTest | `../googletest` |
 
-Missing siblings fall back to the declared remote automatically, so `local-*` is safe to invoke even if you don't have the sibling checked out.
-
-> **Note:** The test target's GoogleTest dependency is fetched via a legacy pre-FetchContent download mechanism in `test/CMakeLists.txt`, not by `FetchContent_Declare`. It is not currently overridable via `FETCHCONTENT_SOURCE_DIR_GOOGLETEST`.
+Missing siblings fall back to the declared remote automatically, so `local-*` is safe to invoke even if you don't have the siblings checked out.
 
 #### Per-machine compiler presets (`CMakeUserPresets.json`)
 

test/CMakeLists.txt

@@ -3,36 +3,26 @@ include_directories("${PROJECT_SOURCE_DIR}")
 set(PROJECT_TEST_NAME ${LIB_NAME}-test)
 
 if(DOWNLOAD_GTEST STREQUAL ON)
-	# Download and unpack googletest at configure time
-	configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
-	execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-	  RESULT_VARIABLE result
-	  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
-	if(result)
-	  message(FATAL_ERROR "CMake step for googletest failed: ${result}")
-	endif()
-	execute_process(COMMAND ${CMAKE_COMMAND} --build .
-	  RESULT_VARIABLE result
-	  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
-	if(result)
-	  message(FATAL_ERROR "Build step for googletest failed: ${result}")
-	endif()
-	# Prevent overriding the parent project's compiler/linker
-	# settings on Windows
-	set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
-	# Add googletest directly to our build. This defines
-	# the gtest and gtest_main targets.
-	add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
-		         ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
-		         EXCLUDE_FROM_ALL)
-
+    if(MSVC)
+        set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+    endif()
+
+    if(NOT TARGET gtest)
+        include(FetchContent)
+        FetchContent_Declare(
+            googletest
+            GIT_REPOSITORY https://github.com/google/googletest.git
+            GIT_TAG v1.16.0
+            GIT_SHALLOW TRUE
+        )
+        FetchContent_MakeAvailable(googletest)
+    endif()
 endif()
 
-add_executable(${PROJECT_TEST_NAME} 
-		read_cs_03.unit.cpp
-		read_cma_example.cpp
-		main.cpp
+add_executable(${PROJECT_TEST_NAME}
+        read_cs_03.unit.cpp
+        read_cma_example.cpp
+        main.cpp
 )
 
 include_directories(${PROJECT_SOURCE_DIR}/src)
@@ -42,4 +32,3 @@ target_link_libraries(${PROJECT_TEST_NAME} gmock_main ${LIB_NAME})
 target_compile_features(${PROJECT_TEST_NAME} PRIVATE cxx_std_17)
 
 add_test(NAME ${PROJECT_TEST_NAME}-runner COMMAND ${PROJECT_TEST_NAME} "${CMAKE_CURRENT_LIST_DIR}")
-