Merge branch 'main' into release

Author: boulderdaze

.github/workflows/gh-pages.yml

@@ -88,6 +88,8 @@ jobs:
           id=$(docker create tuvx)
           docker cp $id:/build/docs/sphinx tmpdocs
           docker rm -v $id
+          # Copy switcher.json to enable version switcher on branch docs
+          cp docs/switcher.json tmpdocs/
           brname="${{github.ref}}"
           brname="${brname##refs/heads/}"
           brdir=${brname//\//--}   # replace '/' with '--'

CITATION.cff

@@ -16,7 +16,7 @@ authors:
   - family-names: Thind
     given-names: Montek
 title: "NCAR/tuv-x"
-version: 0.12.0
+version: 0.13.0
 doi: 10.5281/zenodo.7126039
 url: "https://github.com/NCAR/tuv-x"
 year: 2025

CMakeLists.txt

@@ -3,11 +3,8 @@
 
 cmake_minimum_required(VERSION 3.17)
 
-project(
-  tuv-x
-  VERSION 0.12.0
-  LANGUAGES Fortran CXX C
-)
+# project and version must be on the same line so that the docs can extract it
+project(tuv-x VERSION 0.13.0 LANGUAGES Fortran CXX C)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${PROJECT_SOURCE_DIR}/cmake")
@@ -88,9 +85,7 @@ include(cmake/dependencies.cmake)
 add_subdirectory(src)
 
 # add tuv-x standalone executable
-configure_file(src/version.F90.in version.F90 @ONLY)
-
-add_executable(tuv-x src/tuvx.F90 version.F90)
+add_executable(tuv-x src/tuvx.F90)
 
 set_target_properties(tuv-x
   PROPERTIES

cmake/dependencies.cmake

@@ -59,12 +59,21 @@ FetchContent_Declare(
   GIT_REPOSITORY https://github.com/jbeder/yaml-cpp/
   GIT_TAG 28f93bdec6387d42332220afa9558060c8016795
   GIT_PROGRESS NOT
+  FIND_PACKAGE_ARGS NAMES yaml-cpp
   ${FETCHCONTENT_QUIET})
 
 set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
 
 FetchContent_MakeAvailable(yaml-cpp)
 
+# Ensure yaml-cpp::yaml-cpp target exists (handle both system and FetchContent scenarios)
+if(NOT TARGET yaml-cpp::yaml-cpp)
+  if(TARGET yaml-cpp)
+    # Create alias for system-installed yaml-cpp that provides 'yaml-cpp' target
+    add_library(yaml-cpp::yaml-cpp ALIAS yaml-cpp)
+  endif()
+endif()
+
 # ##############################################################################
 # Docs
 
@@ -80,20 +89,30 @@ if(TUVX_ENABLE_BENCHMARK)
   FetchContent_Declare(
     googlebenchmark
     GIT_REPOSITORY https://github.com/google/benchmark.git
-    GIT_TAG v1.8.3)
+    GIT_TAG v1.8.3
+    FIND_PACKAGE_ARGS NAMES benchmark)
 
   set(BENCHMARK_DOWNLOAD_DEPENDENCIES ON)
   set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
   set(BENCHMARK_ENABLE_ASSEMBLY_TESTS OFF)
   set(BENCHMARK_ENABLE_TESTING OFF)
   FetchContent_MakeAvailable(googlebenchmark)
+  
+  # Ensure benchmark::benchmark target exists (handle both system and FetchContent scenarios)
+  if(NOT TARGET benchmark::benchmark)
+    if(TARGET benchmark)
+      # Create alias for system-installed benchmark that provides 'benchmark' target
+      add_library(benchmark::benchmark ALIAS benchmark)
+    endif()
+  endif()
 endif()
 
 if(TUVX_ENABLE_TESTS)
   FetchContent_Declare(
     googletest
     GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG be03d00f5f0cc3a997d1a368bee8a1fe93651f48)
+    GIT_TAG be03d00f5f0cc3a997d1a368bee8a1fe93651f48
+    FIND_PACKAGE_ARGS NAMES GTest)
 
   set(INSTALL_GTEST
       OFF
@@ -104,9 +123,21 @@ if(TUVX_ENABLE_TESTS)
 
   FetchContent_MakeAvailable(googletest)
 
-  # don't run clang-tidy on google test
-  set_target_properties(gtest PROPERTIES CXX_CLANG_TIDY "")
-  set_target_properties(gtest_main PROPERTIES CXX_CLANG_TIDY "")
+  # Ensure GTest::gtest_main target exists (handle both system and FetchContent scenarios)
+  if(NOT TARGET GTest::gtest_main)
+    if(TARGET gtest_main)
+      # Create alias for system-installed gtest that provides 'gtest_main' target
+      add_library(GTest::gtest_main ALIAS gtest_main)
+    endif()
+  endif()
+
+  # don't run clang-tidy on google test (only when built from source)
+  if(TARGET gtest)
+    set_target_properties(gtest PROPERTIES CXX_CLANG_TIDY "")
+  endif()
+  if(TARGET gtest_main)
+    set_target_properties(gtest_main PROPERTIES CXX_CLANG_TIDY "")
+  endif()
 endif()
 
 # ##############################################################################