diff --git a/.github/actions/ngen-build/action.yaml b/.github/actions/ngen-build/action.yaml
index da90a7352e..dd7ecdebef 100644
--- a/.github/actions/ngen-build/action.yaml
+++ b/.github/actions/ngen-build/action.yaml
@@ -39,6 +39,10 @@ inputs:
       required: false
       description: 'Activate NetCDF Lumped Forcing Support'
       default: 'ON'
+    use_sqlite:
+      required: false
+      description: 'Activate SQLite3 suppport for GeoPackage'
+      default: 'ON'
     use_troute:
       required: false
       description: 'Enable t-route integration support'
@@ -176,6 +180,7 @@ runs:
               -DBMI_FORTRAN_ACTIVE:BOOL=${{ inputs.bmi_fortran }} \
               -DNGEN_ACTIVATE_ROUTING:BOOL=${{ inputs.use_troute }} \
               -DNETCDF_ACTIVE:BOOL=${{ inputs.use_netcdf }} \
+              -DNGEN_WITH_SQLITE:BOOL=${{ inputs.use_sqlite }} \
               -DMPI_ACTIVE:BOOL=${{ inputs.use_mpi }} -S .
             echo "build-dir=$(echo ${{ inputs.build-dir }})" >> $GITHUB_OUTPUT
           shell: bash
diff --git a/.gitignore b/.gitignore
index d75b9abf4b..20ffa96238 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,6 +99,9 @@ CMakeCache.txt
 /build
 /cmake_build*
 
+# Prevent ignoring cmake modules
+!cmake/**/*.cmake
+
 # Static Headers
 include/bmi.hpp
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e44af1020..88cab046e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,238 +1,205 @@
-cmake_minimum_required(VERSION 3.14)
+# Ensure CMake policies have defaults depending on the CMake version used
+# between the two versions specified. e.g. if 3.18 is used, then 3.18 defaults
+# will be used instead of 3.17 defaults.
+cmake_minimum_required(VERSION 3.17...3.26)
 
+# Policies ====================================================================
 
 # Use `LOCATION` for python lookup strategy
 # https://cmake.org/cmake/help/latest/policy/CMP0094.html
-if(POLICY CMP0094)
-    cmake_policy(SET CMP0094 NEW)
-endif()
+cmake_policy(SET CMP0094 NEW)
+
+# find_package() uses <PackageName>_ROOT variables.
+# https://cmake.org/cmake/help/latest/policy/CMP0074.html
+cmake_policy(SET CMP0074 NEW)
 
-if(MPI_ACTIVE)
-   set (CMAKE_CXX_COMPILER "mpicxx")
+# find_package() uses upper-case <PACKAGENAME>_ROOT variables in conjunction with CMP0074.
+# https://cmake.org/cmake/help/latest/policy/CMP0144.html
+if(POLICY CMP0144)
+    cmake_policy(SET CMP0144 NEW)
 endif()
 
-########### Define project version and use via generated config header
+# Project Variables ===========================================================
+set(NGEN_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+set(NGEN_SRC_DIR  "${NGEN_ROOT_DIR}/src")
+set(NGEN_INC_DIR  "${NGEN_ROOT_DIR}/include")
+set(NGEN_EXT_DIR  "${NGEN_ROOT_DIR}/extern")
+set(NGEN_MOD_DIR  "${NGEN_ROOT_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${NGEN_MOD_DIR}")
+
+# Provides:
+#   (1) finds Git package
+#   (2) Sets ${NGEN_HAS_GIT_DIR} to ON/OFF if ${NGEN_ROOT_DIR}/.git exists
+#   (3) Function `git_update_submodule` which updates a given submodule
+include(GitUpdateSubmodules)
+
+# Options =====================================================================
+include(CMakeDependentOption)
+
+option(NGEN_WITH_MPI         "Build with MPI support"             OFF)
+option(NGEN_WITH_NETCDF      "Build with NetCDF support"          ON)
+option(NGEN_WITH_SQLITE      "Build with SQLite3 support"         OFF)
+option(NGEN_WITH_UDUNITS     "Build with UDUNITS2 support"        ON)
+option(NGEN_WITH_BMI_FORTRAN "Build with Fortran BMI support"     OFF)
+option(NGEN_WITH_BMI_C       "Build with C BMI support"           ON)
+option(NGEN_WITH_PYTHON      "Build with embedded Python support" OFF)
+option(NGEN_WITH_TESTS       "Build with unit tests"              ON)
+option(NGEN_QUIET            "Silence output"                     OFF)
+
+# These options require dependency on some of the above options
+# Syntax: cmake_dependent_option(<option> "<help_text>" <value> <depends> <force>)
+cmake_dependent_option(NGEN_WITH_ROUTING "Build with t-route integration" ON "NGEN_WITH_PYTHON" OFF)
+cmake_dependent_option(NGEN_UPDATE_GIT_SUBMODULES "Update submodules on configure" ON "GIT_FOUND;NGEN_HAS_GIT_DIR" OFF)
+
+option(BMI_FORTRAN_ISO_C_LIB_DIR "Directory hint for middleware Fortran shared lib handling iso_c_binding" "${NGEN_ROOT_DIR}/extern/iso_c_fortran_bmi/cmake_build")
+option(BMI_FORTRAN_ISO_C_LIB_NAME "Name for middleware Fortran shared lib handling iso_c_binding" "iso_c_bmi")
+
+include(DeprecatedOptions)
+deprecated_option(OLD MPI_ACTIVE            NEW NGEN_WITH_MPI     INCLUDE_ENV)
+deprecated_option(OLD UDUNITS_ACTIVE        NEW NGEN_WITH_UDUNITS INCLUDE_ENV)
+deprecated_option(OLD NGEN_ACTIVATE_PYTHON  NEW NGEN_WITH_PYTHON  INCLUDE_ENV)
+deprecated_option(OLD NGEN_ACTIVATE_ROUTING NEW NGEN_WITH_ROUTING)
+deprecated_option(OLD NETCDF_ACTIVE         NEW NGEN_WITH_NETCDF)
+deprecated_option(OLD BMI_C_LIB_ACTIVE      NEW NGEN_WITH_BMI_C)
+deprecated_option(OLD BMI_FORTRAN_ACTIVE    NEW NGEN_WITH_BMI_FORTRAN)
+deprecated_option(OLD QUIET                 NEW NGEN_QUIET)
+deprecated_option(OLD PACKAGE_TESTS         NEW NGEN_WITH_TESTS)
+# Project =====================================================================
+
+# -----------------------------------------------------------------------------
+# Set global C++ options
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+
+# Define project version and use via generated config header
 project(ngen VERSION 0.1.0)
-configure_file(include/NGenConfig.h.in include/NGenConfig.h)
 
-if("${PROJECT_NAME}" STREQUAL "${CMAKE_PROJECT_NAME}")
-    option(PACKAGE_TESTS "Build automated tests" ON)
+configure_file("${NGEN_INC_DIR}/NGenConfig.h.in" "${NGEN_INC_DIR}/NGenConfig.h")
+
+add_executable(ngen "${NGEN_SRC_DIR}/NGen.cpp")
+
+# Dependencies ================================================================
+
+# -----------------------------------------------------------------------------
+# Check if NGen is the main project (e.g. development environment)
+if(PROJECT_NAME STREQUAL CMAKE_PROJECT_NAME)
+    set(NGEN_IS_MAIN_PROJECT ON)
 else()
-    option(PACKAGE_TESTS "Build automated tests")
+    set(NGEN_IS_MAIN_PROJECT OFF)
 endif()
 
+# -----------------------------------------------------------------------------
+# If MPI support is enabled, set the C++ compiler to "mpicxx"
+if(NGEN_WITH_MPI)
+    find_package(MPI REQUIRED)
+    add_compile_definitions(NGEN_MPI_ACTIVE)
+endif()
+
+# -----------------------------------------------------------------------------
+# TODO: Used for compatibility on Hera. Refactor this in the future.
 # https://www.intel.com/content/www/us/en/develop/documentation/oneapi-dpcpp-cpp-compiler-dev-guide-and-reference/top/compiler-setup/use-the-command-line/use-cmake-with-the-compiler.html
-if (INTEL_DPCPP)
+if(INTEL_DPCPP)
     find_package(IntelDPCPP REQUIRED)
 endif()
 
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-
-include(ExternalProject)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
-
+# -----------------------------------------------------------------------------
 # Account for different OS and how that impacts shared lib file names
-if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-    set(SHARED_LIB_EXTENSION "dylib")
-elseif(WIN32)
-    error( "Windows platforms are not currently supported" )
+if(WIN32)
+    message(FATAL_ERROR "Windows platforms are not currently supported")
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+    set(NGEN_SHARED_LIB_EXTENSION "dylib")
 else()
-    set(SHARED_LIB_EXTENSION "so")
+    set(NGEN_SHARED_LIB_EXTENSION "so")
 endif()
+add_compile_definitions(NGEN_SHARED_LIB_EXTENSION)
 
-find_package(Git QUIET)
-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-    # Update submodules as needed
-    option(GIT_SUBMODULE "Check submodules during build" ON)
-endif()
-function(git_update_submodule PATH)
-    if(GIT_SUBMODULE)
-        message(STATUS "Updating submodule ${PATH}")
-        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init -- ${PATH}
-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-            RESULT_VARIABLE GIT_SUBMOD_RESULT
-            )
-        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-            message(FATAL_ERROR "git submodule update --init for \"${PATH}\" failed with ${GIT_SUBMOD_RESULT}")
-        endif()
-    else()
-        message(FATAL_ERROR "Git not detected: cannot obtain submodule at \"${PATH}\" (but how is this even working?)")
-    endif()
-endfunction()
-
-set(PROJ_ROOT_INCLUDE_DIR ./include)
-set(PROJ_ROOT_MODELS_DIR ./models)
-
+# -----------------------------------------------------------------------------
 # Find the Boost library and configure usage
 set(Boost_USE_STATIC_LIBS OFF)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-
 if(NOT DEFINED BOOST_ROOT AND NOT DEFINED ENV{BOOST_ROOT})
     # Look for version-specific Boost directory if available (known from Github Actions VM docs)
     if(DEFINED ENV{BOOST_ROOT_1_72_0})
         set(BOOST_ROOT $ENV{BOOST_ROOT_1_72_0})
-        message(STATUS "Using value of \$ENV{BOOST_ROOT_1_72_0} to set BOOST_ROOT=$ENV{BOOST_ROOT_1_72_0}")
-    else()
-        message(STATUS "No BOOST_ROOT set")
     endif()
 endif()
-
 find_package(Boost 1.72.0 REQUIRED)
 
-if(MPI_ACTIVE)
-    find_package(MPI)
-    add_compile_definitions(NGEN_MPI_ACTIVE)
-endif()
-
-find_package(SQLite3)
-if(SQLite3_FOUND)
-    set(NGEN_WITH_SQLITE3 ON)
+# -----------------------------------------------------------------------------
+if(NGEN_WITH_SQLITE)
+    find_package(SQLite3 REQUIRED)
     add_compile_definitions(NGEN_WITH_SQLITE3)
-else()
-    set(NGEN_WITH_SQLITE3 OFF)
-endif()
-message(INFO " SQLite3 support is ${NGEN_WITH_SQLITE3}")
-
-# UDUNITS
-# Since UDUNITS is currently not really optional (yet) let's make it default to on...
-if (NOT (DEFINED UDUNITS_ACTIVE))
-    message(INFO " UDUNITS_ACTIVE not defined")
-    if (DEFINED ENV{UDUNITS_ACTIVE})
-        message(INFO " set as $ENV{UDUNITS_ACTIVE}")
-        set(UDUNITS_ACTIVE $ENV{UDUNITS_ACTIVE})
-    else()
-        set(UDUNITS_ACTIVE true)
-    endif()
 endif()
 
-if(UDUNITS_ACTIVE)
+# -----------------------------------------------------------------------------
+if(NGEN_WITH_UDUNITS)
     find_package(UDUNITS2 REQUIRED)
-    if(UDUNITS2_LIBRARY)
-        #add_library(libudunits2 SHARED IMPORTED)
-        target_include_directories(libudunits2 INTERFACE ${UDUNITS2_INCLUDE})
-        #include_directories(${UDUNITS2_INCLUDE})
-        message("INFO Using UDUNITS2 at ${UDUNITS2_LIBRARY} and ${UDUNITS2_INCLUDE}")
-    endif()
-    #add_compile_definitions("NGEN_UDUNITS2_XML_PATH=\"${UDUNITS_INSTALL_DIR}/share/udunits/udunits2.xml\"")
+    add_compile_definitions(NGEN_WITH_UDUNITS)
+    get_target_property(_SUMMARY_UDUNITS_INCLUDE libudunits2 INTERFACE_INCLUDE_DIRECTORIES)
 endif()
 
-cmake_policy(SET CMP0074 NEW)
-if(NETCDF_ACTIVE)
-    set (NETCDF_CXX "YES")
-    set (NETCDF_F77 "NO")
-    set (NETCDF_F90 "NO")
+# -----------------------------------------------------------------------------
+if(NGEN_WITH_NETCDF)
+    set(NETCDF_CXX "YES")
+    set(NETCDF_F77 "NO")
+    set(NETCDF_F90 "NO")
     find_package(NetCDF REQUIRED)
     add_compile_definitions(NETCDF_ACTIVE)
-    if(NETCDF_FOUND)
-        include_directories(${NETCDF_INCLUDE_DIRS})
-        if(NETCDF_HAS_PARALLEL)
-            message("INFO Using NETCDF (with parallel!) at ${NETCDF_LIBRARIES} and ${NETCDF_INCLUDE_DIRS}")
-        else()
-            message("INFO Using NETCDF (without parallel!) at ${NETCDF_LIBRARIES} and ${NETCDF_INCLUDE_DIRS}")
-        endif()
-    else()
-        message("INFO netCDF library not found")
-    endif()
 endif()
 
-add_executable(ngen
-    src/NGen.cpp
-    )
-
-# Natively support BMI C++ modules and pre-compile in the test_bmi_cpp mock/example.
-set(TEST_BMI_CPP_DIR ${PROJECT_SOURCE_DIR}/extern/test_bmi_cpp)
-git_update_submodule(${PROJECT_SOURCE_DIR}/extern/bmi-cxx)
-add_subdirectory(${TEST_BMI_CPP_DIR} ${TEST_BMI_CPP_DIR}/cmake_build)
-add_dependencies(ngen testbmicppmodel) # because our demo realizations will use it
-
+# -----------------------------------------------------------------------------
 # Handle several steps for BMI C library logic and dependencies, at top level, if functionality is turned on
-if(BMI_C_LIB_ACTIVE)
-    # Define associated preprocessor directive
+if(NGEN_WITH_BMI_C)
     add_compile_definitions(NGEN_BMI_C_LIB_ACTIVE)
 endif()
 
+# -----------------------------------------------------------------------------
 # Configure whether Fortran BMI functionality is active
-if (${BMI_FORTRAN_ACTIVE})
+if(NGEN_WITH_BMI_FORTRAN)
     add_compile_definitions(NGEN_BMI_FORTRAN_ACTIVE)
+    find_package(BMI_FORTRAN_ISO_C REQUIRED)
 endif()
 
-#### Python stuff
-# First, define NGEN_ACTIVATE_PYTHON, if not already defined
-#   Use NGEN_ACTIVATE_PYTHON environment variable if available, or default to true
-if (NOT (DEFINED NGEN_ACTIVATE_PYTHON))
-    if (DEFINED ENV{NGEN_ACTIVATE_PYTHON})
-        message(INFO " NGEN_ACTIVATE_PYTHON set to '$ENV{NGEN_ACTIVATE_PYTHON}' from the environment")
-        set(NGEN_ACTIVATE_PYTHON $ENV{NGEN_ACTIVATE_PYTHON})
-    else()
-        message(INFO " NGEN_ACTIVATE_PYTHON set to 'true' by default")
-        set(NGEN_ACTIVATE_PYTHON true)
-    endif()
-endif()
-
-# If Python set to be active, run steps to make sure it is included properly, and set compiler definition to true
-if (${NGEN_ACTIVATE_PYTHON})
+# -----------------------------------------------------------------------------
+if(NGEN_WITH_PYTHON)
     add_compile_definitions(ACTIVATE_PYTHON=true)
-
     find_package(Python 3.6.8 REQUIRED COMPONENTS Interpreter Development NumPy)
-    #message(INFO " the final Py lib is ${Python_LIBRARY}")
-    #message(INFO " the final Py libraries are ${Python_LIBRARIES}")
-    #message(INFO " the final Py library dirs are ${Python_LIBRARY_DIRS}")
-    #message(INFO " the final Py runtime library dirs are ${Python_RUNTIME_LIBRARY_DIRS}")
-    #message(INFO " the final Py std lib is ${Python_STDLIB}")
-    #message(INFO " the rpath is ${CMAKE_INSTALL_RPATH}")
     set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) # Case-sensitive difference
     add_subdirectory(extern/pybind11)
 endif()
 
-target_include_directories(ngen PUBLIC
-        "${PROJECT_BINARY_DIR}/include" # For generated config header file in binary tree
-        )
-
-  
-# In some IDEs (e.g., CLion), it is easier to work with the code in the included example of an "external" shared library
-# when that code appears to be part of the main project, which can be done by add a statement like the ones below.
-#
-# However, these should be removed or commented out when running CMake builds and in the committed version of this file.
-#
-#add_subdirectory("extern/cfe")
-#add_subdirectory("extern/test_bmi_c")
-
-if(QUIET)
-set(UDUNITS_QUIET true)
-set(ET_QUIET true)
-set(NGEN_QUIET true)
+# -----------------------------------------------------------------------------
+if(NGEN_WITH_ROUTING)
+    add_compile_definitions(NGEN_ROUTING_ACTIVE)
 endif()
 
-if(UDUNITS_QUIET)
-add_compile_definitions(UDUNITS_QUIET)
+# -----------------------------------------------------------------------------
+if(NGEN_QUIET)
+    set(UDUNITS_QUIET true)
+    add_compile_definitions(NGEN_QUIET)
 endif()
 
-if(ET_QUIET)
-add_compile_definitions(ET_QUIET)
+if(UDUNITS_QUIET)
+    add_compile_definitions(UDUNITS_QUIET)
 endif()
 
-if(NGEN_QUIET)
-add_compile_definitions(NGEN_QUIET)
-endif()
+
+# -----------------------------------------------------------------------------
+# Project Targets
+# -----------------------------------------------------------------------------
+target_include_directories(ngen PUBLIC "${NGEN_INC_DIR}")
 
 add_subdirectory("src/core")
-add_dependencies(core libudunits2)
 add_subdirectory("src/geojson")
-
-if(NGEN_WITH_SQLITE3)
-    add_subdirectory("src/geopackage")
-    target_link_libraries(ngen PUBLIC NGen::geopackage)
-endif()
-
 add_subdirectory("src/realizations/catchment")
 add_subdirectory("src/forcing")
 add_subdirectory("src/utilities/mdarray")
 add_subdirectory("src/utilities/mdframe")
 
-target_link_libraries(ngen PUBLIC
+target_link_libraries(ngen
+    PUBLIC
         NGen::core
         NGen::core_catchment
         NGen::core_nexus
@@ -240,93 +207,129 @@ target_link_libraries(ngen PUBLIC
         NGen::realizations_catchment
         NGen::forcing
         NGen::core_mediator
-        libudunits2
-        ${NETCDF_LIBRARIES}
-        )
-
-add_executable(partitionGenerator
-    src/partitionGenerator.cpp
-    )
+)
 
-target_include_directories(partitionGenerator PUBLIC
-        "${PROJECT_BINARY_DIR}/include" # For generated config header file in binary tree
-        )
-
-    target_link_libraries(partitionGenerator PUBLIC
-       core
-       geojson
-       )
+if(NGEN_WITH_SQLITE)
+    add_subdirectory("src/geopackage")
+    target_link_libraries(ngen PUBLIC NGen::geopackage)
+endif()
 
-if(NGEN_ACTIVATE_ROUTING)
-    add_compile_definitions(NGEN_ROUTING_ACTIVE)
+if(NGEN_WITH_ROUTING)
     add_subdirectory("src/routing")
-    target_link_libraries(ngen PUBLIC
-            NGen::routing
-           )
+    target_link_libraries(ngen PUBLIC NGen::routing)
 endif()
 
+add_executable(partitionGenerator src/partitionGenerator.cpp)
+target_include_directories(partitionGenerator PUBLIC "${PROJECT_BINARY_DIR}/include")
+target_link_libraries(partitionGenerator PUBLIC NGen::core NGen::geojson)
+
 # For automated testing with Google Test
-if(PACKAGE_TESTS)
-    enable_testing()
+if(NGEN_WITH_TESTS)
+    include(CTest) # calls enable_testing()
     include(GoogleTest)
     add_subdirectory(test)
 endif()
 
-macro(message_if_defined PRINTNAME)
-if(${ARGN})
-message(STATUS "    ${PRINTNAME}: ${${ARGN}}")
-else()
-message(STATUS "    ${PRINTNAME}: OFF")
-endif()
-endmacro()
+# -----------------------------------------------------------------------------
+# Build Summary
+# -----------------------------------------------------------------------------
 
-message("")
-message(STATUS "---------------------------------------------------------------------")
-message(STATUS "NGen version: ${ngen_VERSION}")
-message(STATUS)
-message(STATUS "Build configuration summary:")
-message(STATUS "  Generator: ${CMAKE_GENERATOR}")
-message(STATUS "  Build type: ${CMAKE_BUILD_TYPE}")
-message(STATUS "  System: ${CMAKE_SYSTEM_NAME}")
-message(STATUS "  C Compiler: ${CMAKE_C_COMPILER}")
-message(STATUS "  CXX Compiler: ${CMAKE_CXX_COMPILER}")
-message(STATUS "  Flags:")
-message_if_defined("NETCDF" NETCDF_ACTIVE)
-message_if_defined("SQLITE3" NGEN_WITH_SQLITE3)
-message_if_defined("UDUNITS" UDUNITS_ACTIVE)
-message_if_defined("MPI" MPI_ACTIVE)
-message_if_defined("BMI FORTRAN" BMI_FORTRAN_ACTIVE)
-message_if_defined("BMI C" BMI_C_LIB_ACTIVE)
-message_if_defined("PYTHON" NGEN_ACTIVATE_PYTHON)
-message_if_defined("ROUTING" NGEN_ACTIVATE_ROUTING)
-message_if_defined("TESTS" PACKAGE_TESTS)
-message_if_defined("QUIET" QUIET)
-
-message(STATUS)
-
-if(Python_FOUND)
-    message(STATUS "Python environment summary:")
-    message(STATUS "  Version: ${Python_VERSION}")
-    message(STATUS "  Executable: ${Python_EXECUTABLE}")
-    message(STATUS "  Interpreter Type: ${Python_INTERPRETER_ID}")
-    message(STATUS "  Site Library: ${Python_SITELIB}")
-    message(STATUS "  Include: ${Python_INCLUDE_DIRS}")
-    message(STATUS "  Runtime Library: ${Python_RUNTIME_LIBRARY_DIRS}")
-    message(STATUS "  NumPy Version: ${Python_NumPy_VERSION}")
-    message(STATUS "  NumPy Include: ${Python_NumPy_INCLUDE_DIRS}")
+# Syntax: ngen_multiline_message("<message 1>" "<message 2>" ...)
+function(ngen_multiline_message)
+set(messages "${ARGN}")
+foreach(msg IN LISTS messages)
+    message(STATUS "${msg}")
+endforeach()
+endfunction()
+
+# Syntax: ngen_dependent_multiline_message(<variable> "<message 1>" "<message 2>" ...)
+function(ngen_dependent_multiline_message VARIABLE)
+if(${VARIABLE})
+    ngen_multiline_message(${ARGN})
 endif()
+endfunction()
 
-if(pybind11_FOUND)
-    message(STATUS "  pybind11 configuration summary:")
-    message(STATUS "    Version: ${pybind11_VERSION}")
-    message(STATUS "    Include: ${pybind11_INCLUDE_DIRS}")
-    message(STATUS "    Definitions: ${pybind11_DEFINITIONS}")
-    message(STATUS "    Libraries: ${pybind11_LIBRARIES}")
+# This is used purely for configuration output,
+# and does not affect the virtual environment used.
+if(DEFINED ENV{VIRTUAL_ENV})
+    set(NGEN_CONFIGURED_VENV "$ENV{VIRTUAL_ENV}")
+else()
+    set(NGEN_CONFIGURED_VENV "<none>")
 endif()
-message(STATUS "---------------------------------------------------------------------")
 
-#set_target_properties(ngen PROPERTIES LINKER_LANGUAGE CXX)
-#
-#target_compile_options(ngen PUBLIC -std=c++14 -Wall)
-#target_compile_features(ngen PUBLIC cxx_std_14)
-#add_subdirectory("src/geojson")
+# MPI CXX libraries output both C and CXX libs
+string(REPLACE ";" "," _MPI_CXX_LIBS "${MPI_CXX_LIBRARIES}")
+
+message(STATUS "---------------------------------------------------------------------")
+ngen_multiline_message(
+"NGen version: ${ngen_VERSION}"
+"Build configuration summary:"
+"  Generator: ${CMAKE_GENERATOR}"
+"  Build type: ${CMAKE_BUILD_TYPE}"
+"  System: ${CMAKE_SYSTEM_NAME}"
+"  C Compiler: ${CMAKE_C_COMPILER}"
+"  CXX Compiler: ${CMAKE_CXX_COMPILER}"
+"  Flags:"
+"    NGEN_WITH_MPI: ${NGEN_WITH_MPI}"
+"    NGEN_WITH_NETCDF: ${NGEN_WITH_NETCDF}"
+"    NGEN_WITH_SQLITE: ${NGEN_WITH_SQLITE}"
+"    NGEN_WITH_UDUNITS: ${NGEN_WITH_UDUNITS}"
+"    NGEN_WITH_BMI_FORTRAN: ${NGEN_WITH_BMI_FORTRAN}"
+"    NGEN_WITH_BMI_C: ${NGEN_WITH_BMI_C}"
+"    NGEN_WITH_PYTHON: ${NGEN_WITH_PYTHON}"
+"    NGEN_WITH_ROUTING: ${NGEN_WITH_ROUTING}"
+"    NGEN_WITH_TESTS: ${NGEN_WITH_TESTS}"
+"    NGEN_QUIET: ${NGEN_QUIET}"
+"Environment summary:"
+"  Boost:"
+"    Version: ${Boost_VERSION}"
+"    Include: ${Boost_INCLUDE_DIRS}")
+ngen_dependent_multiline_message(INTEL_DPCPP
+"  Intel DPC++:"
+"    Version: ${SYCL_LANGUAGE_VERSION}"
+"    Include: ${SYCL_INCLUDE_DIR}"
+"    Implmentation: ${SYCL_IMPLEMENTATION_ID}")
+ngen_dependent_multiline_message(NGEN_WITH_MPI
+"  MPI (C):"
+"    Version: ${MPI_C_VERSION}"
+"    Library: ${MPI_C_LIBRARIES}"
+"    Include: ${MPI_C_INCLUDE_DIRS}")
+ngen_dependent_multiline_message(NGEN_WITH_MPI
+"  MPI (CXX):"
+"    Version: ${MPI_CXX_VERSION}"
+"    Library: ${_MPI_CXX_LIBS}"
+"    Include: ${MPI_CXX_INCLUDE_DIRS}")
+ngen_dependent_multiline_message(NGEN_WITH_NETCDF
+"  NetCDF:"
+"    Library: ${NETCDF_LIBRARY}"
+"    Library (CXX): ${NETCDF_CXX_LIBRARIES}"
+"    Include: ${NETCDF_INCLUDE_DIR}"
+"    Parallel: ${NETCDF_HAS_PARALLEL}")
+ngen_dependent_multiline_message(NGEN_WITH_SQLITE
+"  SQLite:"
+"    Version: ${SQLite3_VERSION}"
+"    Library: ${SQLite3_LIBRARIES}"
+"    Include: ${SQLite3_INCLUDE_DIRS}")
+ngen_dependent_multiline_message(NGEN_WITH_UDUNITS
+"  UDUNITS2:"
+"    Library: ${UDUNITS2_LIBRARY}"
+"    Include: ${_SUMMARY_UDUNITS_INCLUDE}")
+ngen_dependent_multiline_message(NGEN_WITH_BMI_FORTRAN
+"  Fortran:"
+"    BMI_FORTRAN_ISO_C_LIB_PATH: ${BMI_FORTRAN_ISO_C_LIB_PATH}"
+"    BMI_FORTRAN_ISO_C_LIB_NAME: ${BMI_FORTRAN_ISO_C_LIB_NAME}"
+"    BMI_FORTRAN_ISO_C_LIB_DIR: ${BMI_FORTRAN_ISO_C_LIB_DIR}")
+ngen_dependent_multiline_message(NGEN_WITH_PYTHON
+"  Python:"
+"    Version: ${Python_VERSION}"
+"    Virtual Env: ${NGEN_CONFIGURED_VENV}"
+"    Executable: ${Python_EXECUTABLE}"
+"    Interpreter Type: ${Python_INTERPRETER_ID}"
+"    Site Library: ${Python_SITELIB}"
+"    Include: ${Python_INCLUDE_DIRS}"
+"    Runtime Library: ${Python_RUNTIME_LIBRARY_DIRS}"
+"    NumPy Version: ${Python_NumPy_VERSION}"
+"    NumPy Include: ${Python_NumPy_INCLUDE_DIRS}"
+"    pybind11 Version: ${pybind11_VERSION}"
+"    pybind11 Include: ${pybind11_INCLUDE_DIR}")
+message(STATUS "---------------------------------------------------------------------")
diff --git a/cmake/DeprecatedOptions.cmake b/cmake/DeprecatedOptions.cmake
new file mode 100644
index 0000000000..f5c82776f0
--- /dev/null
+++ b/cmake/DeprecatedOptions.cmake
@@ -0,0 +1,28 @@
+#[==[
+deprecated_option(NEW <variable> OLD <variable> [INCLUDE_ENV])
+
+Adds a CMake option that will output a deprecation message on use.
+
+The `NEW` variable is the option that should be used when building.
+
+The `OLD` variable is the deprecated option that corresponds to a new option.
+
+The `INCLUDE_ENV` flag also checks the environment variables for a variable named `OLD`, i.e. ENV{<OLD variable>}.
+#]==]
+function(deprecated_option)
+    set(options INCLUDE_ENV)
+    set(oneValueArgs NEW OLD)
+    cmake_parse_arguments(DEPRECATED_OPTION "${options}" "${oneValueArgs}" "" ${ARGN})
+
+    if(DEFINED ${DEPRECATED_OPTION_OLD})
+        message(DEPRECATION "Deprecated option ${DEPRECATED_OPTION_OLD} defined; setting ${DEPRECATED_OPTION_NEW} to ${DEPRECATED_OPTION_OLD} (aka ${${DEPRECATED_OPTION_OLD}})")
+        set(${DEPRECATED_OPTION_NEW} ${${DEPRECATED_OPTION_OLD}} PARENT_SCOPE)
+    endif()
+
+    if(DEPRECATED_OPTION_INCLUDE_ENV)
+        if(DEFINED ENV{${DEPRECATED_OPTION_OLD}})
+            message(DEPRECATION "Deprecated environment variable ${DEPRECATED_OPTION_OLD} defined; setting ${DEPRECATED_OPTION_NEW} to ENV{${DEPRECATED_OPTION_OLD}} (aka $ENV{${DEPRECATED_OPTION_OLD}})")
+            set(${DEPRECATED_OPTION_NEW} $ENV{${DEPRECATED_OPTION_OLD}} PARENT_SCOPE)
+        endif()
+    endif()
+endfunction()
diff --git a/cmake/FindBMI_FORTRAN_ISO_C.cmake b/cmake/FindBMI_FORTRAN_ISO_C.cmake
new file mode 100644
index 0000000000..48d2a0e435
--- /dev/null
+++ b/cmake/FindBMI_FORTRAN_ISO_C.cmake
@@ -0,0 +1,23 @@
+# Searches for ISO C BMI library, defaults to
+# known development directories in the event the BMI_FORTRAN_ISO_C_*
+# variables are not set.
+find_library(BMI_FORTRAN_ISO_C_LIB_PATH
+    NAMES
+        "${BMI_FORTRAN_ISO_C_LIB_NAME}"
+        "iso_c_bmi"
+    HINTS # Searched before paths
+        "${BMI_FORTRAN_ISO_C_LIB_DIR}" 
+    PATHS
+        ENV BMI_FORTRAN_ISO_C_LIB_DIR
+        "${NGEN_ROOT_DIR}/extern/iso_c_fortran_bmi/cmake_build"
+        "${NGEN_ROOT_DIR}/extern/iso_c_fortran_bmi/build"
+    DOC "Path to middleware Fortran shared lib handling iso_c_binding"
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(BMI_FORTRAN_ISO_C DEFAULT_MSG BMI_FORTRAN_ISO_C_LIB_PATH)
+
+if(BMI_FORTRAN_ISO_C_FOUND)
+    add_library(bmi_fortran_iso_c SHARED IMPORTED)
+    set_target_properties(bmi_fortran_iso_c PROPERTIES IMPORTED_LOCATION "${BMI_FORTRAN_ISO_C_LIB_PATH}")
+endif()
diff --git a/cmake/FindNetCDF.cmake b/cmake/FindNetCDF.cmake
index 194b1a0d32..954e76003c 100644
--- a/cmake/FindNetCDF.cmake
+++ b/cmake/FindNetCDF.cmake
@@ -1,131 +1,146 @@
-#[==[
-Provides the following variables:
+# - Find NetCDF
+# Find the native NetCDF includes and library
+#
+#  NETCDF_INCLUDE_DIR  - user modifiable choice of where netcdf headers are
+#  NETCDF_LIBRARY      - user modifiable choice of where netcdf libraries are
+#
+# Your package can require certain interfaces to be FOUND by setting these
+#
+#  NETCDF_CXX         - require the C++ interface and link the C++ library
+#  NETCDF_F77         - require the F77 interface and link the fortran library
+#  NETCDF_F90         - require the F90 interface and link the fortran library
+#
+# Or equivalently by calling FindNetCDF with a COMPONENTS argument containing one or
+# more of "CXX;F77;F90".
+#
+# When interfaces are requested the user has access to interface specific hints:
+#
+#  NETCDF_${LANG}_INCLUDE_DIR - where to search for interface header files
+#  NETCDF_${LANG}_LIBRARY     - where to search for interface libraries
+#
+# This module returns these variables for the rest of the project to use.
+#
+#  NETCDF_FOUND          - True if NetCDF found including required interfaces (see below)
+#  NETCDF_LIBRARIES      - All netcdf related libraries.
+#  NETCDF_INCLUDE_DIRS   - All directories to include.
+#  NETCDF_HAS_INTERFACES - Whether requested interfaces were found or not.
+#  NETCDF_${LANG}_INCLUDE_DIRS/NETCDF_${LANG}_LIBRARIES - C/C++/F70/F90 only interface
+#  NETCDF_HAS_PARALLEL   - Whether or not NetCDF was found with parallel IO support.
+#
+# Normal usage would be:
+#  set (NETCDF_F90 "YES")
+#  find_package (NetCDF REQUIRED)
+#  target_link_libraries (uses_everthing ${NETCDF_LIBRARIES})
+#  target_link_libraries (only_uses_f90 ${NETCDF_F90_LIBRARIES})
+
+#search starting from user editable cache var
+if (NETCDF_INCLUDE_DIR AND NETCDF_LIBRARY)
+  # Already in cache, be silent
+  set (NETCDF_FIND_QUIETLY TRUE)
+endif ()
+
+set(USE_DEFAULT_PATHS "NO_DEFAULT_PATH")
+if(NETCDF_USE_DEFAULT_PATHS)
+  set(USE_DEFAULT_PATHS "")
+endif()
+
+find_path (NETCDF_INCLUDE_DIR netcdf.h
+  PATHS "${NetCDF_ROOT}/include")
+mark_as_advanced (NETCDF_INCLUDE_DIR)
+set (NETCDF_C_INCLUDE_DIRS ${NETCDF_INCLUDE_DIR})
+
+find_library (NETCDF_LIBRARY NAMES netcdf
+  PATHS "${NetCDF_ROOT}/lib"
+  HINTS "${NETCDF_INCLUDE_DIR}/../lib")
+mark_as_advanced (NETCDF_LIBRARY)
+
+set (NETCDF_C_LIBRARIES ${NETCDF_LIBRARY})
+
+#start finding requested language components
+set (NetCDF_libs "")
+set (NetCDF_includes "${NETCDF_INCLUDE_DIR}")
+
+get_filename_component (NetCDF_lib_dirs "${NETCDF_LIBRARY}" PATH)
+set (NETCDF_HAS_INTERFACES "YES") # will be set to NO if we're missing any interfaces
+
+macro (NetCDF_check_interface lang header libs)
+  if (NETCDF_${lang})
+    #search starting from user modifiable cache var
+    find_path (NETCDF_${lang}_INCLUDE_DIR NAMES ${header}
+      HINTS "${NETCDF_INCLUDE_DIR}"
+      HINTS "${NETCDF_${lang}_ROOT}/include"
+      ${USE_DEFAULT_PATHS})
+    find_library (NETCDF_${lang}_LIBRARY NAMES ${libs}
+      HINTS "${NetCDF_lib_dirs}"
+      HINTS "${NETCDF_${lang}_ROOT}/lib"
+      ${USE_DEFAULT_PATHS})
+
+    mark_as_advanced (NETCDF_${lang}_INCLUDE_DIR NETCDF_${lang}_LIBRARY)
+
+    #export to internal varS that rest of project can use directly
+    set (NETCDF_${lang}_LIBRARIES ${NETCDF_${lang}_LIBRARY})
+    set (NETCDF_${lang}_INCLUDE_DIRS ${NETCDF_${lang}_INCLUDE_DIR})
+
+    if (NETCDF_${lang}_INCLUDE_DIR AND NETCDF_${lang}_LIBRARY)
+      list (APPEND NetCDF_libs ${NETCDF_${lang}_LIBRARY})
+      list (APPEND NetCDF_includes ${NETCDF_${lang}_INCLUDE_DIR})
+    else ()
+      set (NETCDF_HAS_INTERFACES "NO")
+      message (STATUS "Failed to find NetCDF interface for ${lang}")
+    endif ()
+  endif ()
+endmacro ()
 
-  * `NetCDF_FOUND`: Whether NetCDF was found or not.
-  * `NetCDF_INCLUDE_DIRS`: Include directories necessary to use NetCDF.
-  * `NetCDF_LIBRARIES`: Libraries necessary to use NetCDF.
-  * `NetCDF_VERSION`: The version of NetCDF found.
-  * `NetCDF::NetCDF`: A target to use with `target_link_libraries`.
-  * `NetCDF_HAS_PARALLEL`: Whether or not NetCDF was found with parallel IO support.
-#]==]
+list (FIND NetCDF_FIND_COMPONENTS "CXX" _nextcomp)
+if (_nextcomp GREATER -1)
+  set (NETCDF_CXX 1)
+endif ()
+list (FIND NetCDF_FIND_COMPONENTS "F77" _nextcomp)
+if (_nextcomp GREATER -1)
+  set (NETCDF_F77 1)
+endif ()
+list (FIND NetCDF_FIND_COMPONENTS "F90" _nextcomp)
+if (_nextcomp GREATER -1)
+  set (NETCDF_F90 1)
+endif ()
+set( NETCDF_CXX_LIBRARY_NAMES_LIST netcdf_c++4 netcdf-cxx4 )
+NetCDF_check_interface (CXX netcdf "${NETCDF_CXX_LIBRARY_NAMES_LIST}")
+NetCDF_check_interface (F77 netcdf.inc  netcdff)
+NetCDF_check_interface (F90 netcdf.mod  netcdff)
+
+#export accumulated results to internal varS that rest of project can depend on
+list (APPEND NetCDF_libs "${NETCDF_C_LIBRARIES}")
+set (NETCDF_LIBRARIES ${NetCDF_libs})
+set (NETCDF_INCLUDE_DIRS ${NetCDF_includes})
+
+# handle the QUIETLY and REQUIRED arguments and set NETCDF_FOUND to TRUE if
+# all listed variables are TRUE
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (NetCDF
+  DEFAULT_MSG NETCDF_LIBRARIES NETCDF_INCLUDE_DIRS NETCDF_HAS_INTERFACES)
 
 function(FindNetCDF_get_is_parallel_aware include_dir)
   file(STRINGS "${include_dir}/netcdf_meta.h" _netcdf_lines
     REGEX "#define[ \t]+NC_HAS_PARALLEL[ \t]")
   string(REGEX REPLACE ".*NC_HAS_PARALLEL[ \t]*([0-1]+).*" "\\1" _netcdf_has_parallel "${_netcdf_lines}")
   if (_netcdf_has_parallel)
-    set(NetCDF_HAS_PARALLEL TRUE PARENT_SCOPE)
+    set(NETCDF_HAS_PARALLEL TRUE PARENT_SCOPE)
   else()
-    set(NetCDF_HAS_PARALLEL FALSE PARENT_SCOPE)
+    set(NETCDF_HAS_PARALLEL FALSE PARENT_SCOPE)
   endif()
 endfunction()
 
-# Try to find a CMake-built NetCDF.
-find_package(netCDF CONFIG QUIET)
-if (netCDF_FOUND)
-  # Forward the variables in a consistent way.
-  set(NetCDF_FOUND "${netCDF_FOUND}")
-  set(NetCDF_INCLUDE_DIRS "${netCDF_INCLUDE_DIR}")
-  set(NetCDF_LIBRARIES "${netCDF_LIBRARIES}")
-  set(NetCDF_VERSION "${NetCDFVersion}")
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(NetCDF
-    REQUIRED_VARS NetCDF_INCLUDE_DIRS NetCDF_LIBRARIES
-    VERSION_VAR NetCDF_VERSION)
-
-  if (NOT TARGET NetCDF::NetCDF)
-    add_library(NetCDF::NetCDF INTERFACE IMPORTED)
-    if (TARGET "netCDF::netcdf")
-      # 4.7.3
-      set_target_properties(NetCDF::NetCDF PROPERTIES
-        INTERFACE_LINK_LIBRARIES "netCDF::netcdf")
-    elseif (TARGET "netcdf")
-      set_target_properties(NetCDF::NetCDF PROPERTIES
-        INTERFACE_LINK_LIBRARIES "netcdf")
-    else ()
-      set_target_properties(NetCDF::NetCDF PROPERTIES
-        INTERFACE_LINK_LIBRARIES "${netCDF_LIBRARIES}")
-    endif ()
-  endif ()
-
-  FindNetCDF_get_is_parallel_aware("${NetCDF_INCLUDE_DIRS}")
-  # Skip the rest of the logic in this file.
-  return ()
+if (NETCDF_INCLUDE_DIR)
+  FindNetCDF_get_is_parallel_aware("${NETCDF_INCLUDE_DIR}")
 endif ()
 
-find_package(PkgConfig QUIET)
-if (PkgConfig_FOUND)
-  pkg_check_modules(_NetCDF QUIET netcdf IMPORTED_TARGET)
-  if (_NetCDF_FOUND)
-    # Forward the variables in a consistent way.
-    set(NetCDF_FOUND "${_NetCDF_FOUND}")
-    set(NetCDF_INCLUDE_DIRS "${_NetCDF_INCLUDE_DIRS}")
-    set(NetCDF_LIBRARIES "${_NetCDF_LIBRARIES}")
-    set(NetCDF_VERSION "${_NetCDF_VERSION}")
-
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(NetCDF
-      REQUIRED_VARS NetCDF_LIBRARIES
-      # This is not required because system-default include paths are not
-      # reported by `FindPkgConfig`, so this might be empty. Assume that if we
-      # have a library, the include directories are fine (if any) since
-      # PkgConfig reported that the package was found.
-      # NetCDF_INCLUDE_DIRS
-      VERSION_VAR NetCDF_VERSION)
-
-    if (NOT TARGET NetCDF::NetCDF)
-      add_library(NetCDF::NetCDF INTERFACE IMPORTED)
-      set_target_properties(NetCDF::NetCDF PROPERTIES
-        INTERFACE_LINK_LIBRARIES "PkgConfig::_NetCDF")
-    endif ()
-
-    FindNetCDF_get_is_parallel_aware("${_NetCDF_INCLUDEDIR}")
-    # Skip the rest of the logic in this file.
-    return ()
-  endif ()
-endif ()
-
-find_path(NetCDF_INCLUDE_DIR
-  NAMES netcdf.h
-  DOC "netcdf include directories")
-mark_as_advanced(NetCDF_INCLUDE_DIR)
-
-find_library(NetCDF_LIBRARY
-  NAMES netcdf
-  DOC "netcdf library")
-mark_as_advanced(NetCDF_LIBRARY)
-
-if (NetCDF_INCLUDE_DIR)
-  file(STRINGS "${NetCDF_INCLUDE_DIR}/netcdf_meta.h" _netcdf_version_lines
-    REGEX "#define[ \t]+NC_VERSION_(MAJOR|MINOR|PATCH|NOTE)")
-  string(REGEX REPLACE ".*NC_VERSION_MAJOR *\([0-9]*\).*" "\\1" _netcdf_version_major "${_netcdf_version_lines}")
-  string(REGEX REPLACE ".*NC_VERSION_MINOR *\([0-9]*\).*" "\\1" _netcdf_version_minor "${_netcdf_version_lines}")
-  string(REGEX REPLACE ".*NC_VERSION_PATCH *\([0-9]*\).*" "\\1" _netcdf_version_patch "${_netcdf_version_lines}")
-  string(REGEX REPLACE ".*NC_VERSION_NOTE *\"\([^\"]*\)\".*" "\\1" _netcdf_version_note "${_netcdf_version_lines}")
-  set(NetCDF_VERSION "${_netcdf_version_major}.${_netcdf_version_minor}.${_netcdf_version_patch}${_netcdf_version_note}")
-  unset(_netcdf_version_major)
-  unset(_netcdf_version_minor)
-  unset(_netcdf_version_patch)
-  unset(_netcdf_version_note)
-  unset(_netcdf_version_lines)
-
-  FindNetCDF_get_is_parallel_aware("${NetCDF_INCLUDE_DIR}")
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(NetCDF
-  REQUIRED_VARS NetCDF_LIBRARY NetCDF_INCLUDE_DIR
-  VERSION_VAR NetCDF_VERSION)
-
-if (NetCDF_FOUND)
-  set(NetCDF_INCLUDE_DIRS "${NetCDF_INCLUDE_DIR}")
-  set(NetCDF_LIBRARIES "${NetCDF_LIBRARY}")
-
-  if (NOT TARGET NetCDF::NetCDF)
-    add_library(NetCDF::NetCDF UNKNOWN IMPORTED)
-    set_target_properties(NetCDF::NetCDF PROPERTIES
-      IMPORTED_LOCATION "${NetCDF_LIBRARY}"
-      INTERFACE_INCLUDE_DIRECTORIES "${NetCDF_INCLUDE_DIR}")
-  endif ()
-endif ()
+if(NETCDF_FOUND)
+  # Create NetCDF target
+  add_library(NetCDF SHARED IMPORTED GLOBAL)
+  target_include_directories(NetCDF INTERFACE "${NETCDF_INCLUDE_DIR}" "${NETCDF_CXX_INCLUDE_DIR}")
+  target_link_libraries(NetCDF INTERFACE "${NETCDF_LIBRARY}" "${NETCDF_CXX_LIBRARY}")
+  set_target_properties(NetCDF
+      PROPERTIES
+          IMPORTED_LOCATION "${NETCDF_LIBRARY}"
+          IMPORTED_LOCATION "${NETCDF_CXX_LIBRARY}")
+endif()
diff --git a/cmake/FindUDUNITS2.cmake b/cmake/FindUDUNITS2.cmake
new file mode 100644
index 0000000000..643157c588
--- /dev/null
+++ b/cmake/FindUDUNITS2.cmake
@@ -0,0 +1,34 @@
+find_path(UDUNITS2_INCLUDE 
+    NAMES udunits2.h
+    PATH_SUFFIXES udunits2
+    DOC "UDUNITS-2 include directories"
+)
+mark_as_advanced(UDUNITS2_INCLUDE)
+
+find_library(UDUNITS2_LIBRARY
+    NAMES
+        libudunits2.so
+        libudunits2.dylib
+)
+mark_as_advanced(UDUNITS2_LIBRARY)
+
+if(DEFINED UDUNITS2_INCLUDE AND DEFINED UDUNITS2_LIBRARY)
+    set(UDUNITS2_FOUND ON)
+else()
+    set(UDUNITS2_FOUND OFF)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(UDUNITS2 DEFAULT_MSG UDUNITS2_LIBRARY UDUNITS2_INCLUDE)
+
+if(UDUNITS2_FOUND)
+    # Create UDUNITS2 target
+    # Note: GLOBAL is required here in order to extend the scope of the target.
+    #       see: https://stackoverflow.com/a/46491758/6891484
+    add_library(libudunits2 SHARED IMPORTED GLOBAL)
+    set_target_properties(libudunits2 PROPERTIES IMPORTED_LOCATION "${UDUNITS2_LIBRARY}")
+    target_include_directories(libudunits2 INTERFACE "${UDUNITS2_INCLUDE}")
+
+    # Based on: https://stackoverflow.com/questions/26834553/osx-10-10-cmake-3-0-2-and-clang-wont-find-local-headers
+    include_directories(${UDUNITS2_INCLUDE})
+endif()
diff --git a/cmake/GitUpdateSubmodules.cmake b/cmake/GitUpdateSubmodules.cmake
new file mode 100644
index 0000000000..d9ec78f38f
--- /dev/null
+++ b/cmake/GitUpdateSubmodules.cmake
@@ -0,0 +1,22 @@
+find_package(Git QUIET)
+
+if(EXISTS "${NGEN_ROOT_DIR}/.git")
+    set(NGEN_HAS_GIT_DIR ON)
+else()
+    set(NGEN_HAS_GIT_DIR OFF)
+endif()
+
+function(git_update_submodule PATH)
+    if(NGEN_UPDATE_GIT_SUBMODULES)
+        message(STATUS "Updating submodule ${PATH}")
+        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init -- ${PATH}
+            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+            RESULT_VARIABLE GIT_SUBMOD_RESULT
+            )
+        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+            message(FATAL_ERROR "git submodule update --init for \"${PATH}\" failed with ${GIT_SUBMOD_RESULT}")
+        endif()
+    else()
+        message(FATAL_ERROR "Git not detected: cannot obtain submodule at \"${PATH}\" (but how is this even working?)")
+    endif()
+endfunction()
diff --git a/cmake/dynamic_sourced_library.cmake b/cmake/dynamic_sourced_library.cmake
index 8352757cc0..67e492f66c 100644
--- a/cmake/dynamic_sourced_library.cmake
+++ b/cmake/dynamic_sourced_library.cmake
@@ -2,14 +2,6 @@
 ## Params: LIB_NAME, WORK_DIR
 ## Add/create a new library with the given name, passing as source files all the '*.cpp' files found in the given working directory for the library
 function(dynamic_sourced_cxx_library LIB_NAME WORK_DIR)
-    execute_process(COMMAND ls
-            COMMAND grep .cpp
-            WORKING_DIRECTORY "${WORK_DIR}"
-            OUTPUT_VARIABLE lib_CPP_FILES
-            )
-    string(REGEX REPLACE "\n$" "" lib_CPP_FILES "${lib_CPP_FILES}")
-    string(REPLACE "\n" ";" lib_CPP_FILES ${lib_CPP_FILES})
-    set(lib_CPP_FILES_LIST ${lib_CPP_FILES})
-
+    file(GLOB_RECURSE lib_CPP_FILES_LIST CONFIGURE_DEPENDS "*.cpp")
     add_library(${LIB_NAME} STATIC ${lib_CPP_FILES_LIST})
 endfunction()
diff --git a/cmake/modules/FindNetCDF.cmake b/cmake/modules/FindNetCDF.cmake
deleted file mode 100644
index 7299948119..0000000000
--- a/cmake/modules/FindNetCDF.cmake
+++ /dev/null
@@ -1,136 +0,0 @@
-# - Find NetCDF
-# Find the native NetCDF includes and library
-#
-#  NETCDF_INCLUDE_DIR  - user modifiable choice of where netcdf headers are
-#  NETCDF_LIBRARY      - user modifiable choice of where netcdf libraries are
-#
-# Your package can require certain interfaces to be FOUND by setting these
-#
-#  NETCDF_CXX         - require the C++ interface and link the C++ library
-#  NETCDF_F77         - require the F77 interface and link the fortran library
-#  NETCDF_F90         - require the F90 interface and link the fortran library
-#
-# Or equivalently by calling FindNetCDF with a COMPONENTS argument containing one or
-# more of "CXX;F77;F90".
-#
-# When interfaces are requested the user has access to interface specific hints:
-#
-#  NETCDF_${LANG}_INCLUDE_DIR - where to search for interface header files
-#  NETCDF_${LANG}_LIBRARY     - where to search for interface libraries
-#
-# This module returns these variables for the rest of the project to use.
-#
-#  NETCDF_FOUND          - True if NetCDF found including required interfaces (see below)
-#  NETCDF_LIBRARIES      - All netcdf related libraries.
-#  NETCDF_INCLUDE_DIRS   - All directories to include.
-#  NETCDF_HAS_INTERFACES - Whether requested interfaces were found or not.
-#  NETCDF_${LANG}_INCLUDE_DIRS/NETCDF_${LANG}_LIBRARIES - C/C++/F70/F90 only interface
-#  NETCDF_HAS_PARALLEL   - Whether or not NetCDF was found with parallel IO support.
-#
-# Normal usage would be:
-#  set (NETCDF_F90 "YES")
-#  find_package (NetCDF REQUIRED)
-#  target_link_libraries (uses_everthing ${NETCDF_LIBRARIES})
-#  target_link_libraries (only_uses_f90 ${NETCDF_F90_LIBRARIES})
-
-#search starting from user editable cache var
-if (NETCDF_INCLUDE_DIR AND NETCDF_LIBRARY)
-  # Already in cache, be silent
-  set (NETCDF_FIND_QUIETLY TRUE)
-endif ()
-
-set(USE_DEFAULT_PATHS "NO_DEFAULT_PATH")
-if(NETCDF_USE_DEFAULT_PATHS)
-  set(USE_DEFAULT_PATHS "")
-endif()
-
-find_path (NETCDF_INCLUDE_DIR netcdf.h
-  PATHS "${NetCDF_ROOT}/include")
-mark_as_advanced (NETCDF_INCLUDE_DIR)
-set (NETCDF_C_INCLUDE_DIRS ${NETCDF_INCLUDE_DIR})
-
-find_library (NETCDF_LIBRARY NAMES netcdf
-  PATHS "${NetCDF_ROOT}/lib"
-  HINTS "${NETCDF_INCLUDE_DIR}/../lib")
-mark_as_advanced (NETCDF_LIBRARY)
-
-set (NETCDF_C_LIBRARIES ${NETCDF_LIBRARY})
-
-#start finding requested language components
-set (NetCDF_libs "")
-set (NetCDF_includes "${NETCDF_INCLUDE_DIR}")
-
-get_filename_component (NetCDF_lib_dirs "${NETCDF_LIBRARY}" PATH)
-set (NETCDF_HAS_INTERFACES "YES") # will be set to NO if we're missing any interfaces
-
-macro (NetCDF_check_interface lang header libs)
-  if (NETCDF_${lang})
-    #search starting from user modifiable cache var
-    find_path (NETCDF_${lang}_INCLUDE_DIR NAMES ${header}
-      HINTS "${NETCDF_INCLUDE_DIR}"
-      HINTS "${NETCDF_${lang}_ROOT}/include"
-      ${USE_DEFAULT_PATHS})
-    find_library (NETCDF_${lang}_LIBRARY NAMES ${libs}
-      HINTS "${NetCDF_lib_dirs}"
-      HINTS "${NETCDF_${lang}_ROOT}/lib"
-      ${USE_DEFAULT_PATHS})
-
-    mark_as_advanced (NETCDF_${lang}_INCLUDE_DIR NETCDF_${lang}_LIBRARY)
-
-    #export to internal varS that rest of project can use directly
-    set (NETCDF_${lang}_LIBRARIES ${NETCDF_${lang}_LIBRARY})
-    set (NETCDF_${lang}_INCLUDE_DIRS ${NETCDF_${lang}_INCLUDE_DIR})
-
-    if (NETCDF_${lang}_INCLUDE_DIR AND NETCDF_${lang}_LIBRARY)
-      list (APPEND NetCDF_libs ${NETCDF_${lang}_LIBRARY})
-      list (APPEND NetCDF_includes ${NETCDF_${lang}_INCLUDE_DIR})
-    else ()
-      set (NETCDF_HAS_INTERFACES "NO")
-      message (STATUS "Failed to find NetCDF interface for ${lang}")
-    endif ()
-  endif ()
-endmacro ()
-
-list (FIND NetCDF_FIND_COMPONENTS "CXX" _nextcomp)
-if (_nextcomp GREATER -1)
-  set (NETCDF_CXX 1)
-endif ()
-list (FIND NetCDF_FIND_COMPONENTS "F77" _nextcomp)
-if (_nextcomp GREATER -1)
-  set (NETCDF_F77 1)
-endif ()
-list (FIND NetCDF_FIND_COMPONENTS "F90" _nextcomp)
-if (_nextcomp GREATER -1)
-  set (NETCDF_F90 1)
-endif ()
-set( NETCDF_CXX_LIBRARY_NAMES_LIST netcdf_c++4 netcdf-cxx4 )
-NetCDF_check_interface (CXX netcdf "${NETCDF_CXX_LIBRARY_NAMES_LIST}")
-NetCDF_check_interface (F77 netcdf.inc  netcdff)
-NetCDF_check_interface (F90 netcdf.mod  netcdff)
-
-#export accumulated results to internal varS that rest of project can depend on
-list (APPEND NetCDF_libs "${NETCDF_C_LIBRARIES}")
-set (NETCDF_LIBRARIES ${NetCDF_libs})
-set (NETCDF_INCLUDE_DIRS ${NetCDF_includes})
-message("INFO find NETCDF at ${NETCDF_LIBRARIES} and ${NETCDF_INCLUDE_DIRS} in cmake/modules/FindNetCDF.cmake")
-
-# handle the QUIETLY and REQUIRED arguments and set NETCDF_FOUND to TRUE if
-# all listed variables are TRUE
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (NetCDF
-  DEFAULT_MSG NETCDF_LIBRARIES NETCDF_INCLUDE_DIRS NETCDF_HAS_INTERFACES)
-
-function(FindNetCDF_get_is_parallel_aware include_dir)
-  file(STRINGS "${include_dir}/netcdf_meta.h" _netcdf_lines
-    REGEX "#define[ \t]+NC_HAS_PARALLEL[ \t]")
-  string(REGEX REPLACE ".*NC_HAS_PARALLEL[ \t]*([0-1]+).*" "\\1" _netcdf_has_parallel "${_netcdf_lines}")
-  if (_netcdf_has_parallel)
-    set(NETCDF_HAS_PARALLEL TRUE PARENT_SCOPE)
-  else()
-    set(NETCDF_HAS_PARALLEL FALSE PARENT_SCOPE)
-  endif()
-endfunction()
-
-if (NETCDF_INCLUDE_DIR)
-  FindNetCDF_get_is_parallel_aware("${NETCDF_INCLUDE_DIR}")
-endif ()
diff --git a/cmake/modules/FindUDUNITS2.cmake b/cmake/modules/FindUDUNITS2.cmake
deleted file mode 100644
index 158ddea2d9..0000000000
--- a/cmake/modules/FindUDUNITS2.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-message("Looking for UDUNITS-2...")
-find_path(UDUNITS2_INCLUDE 
-    NAMES udunits2.h
-    PATH_SUFFIXES udunits2
-    DOC "UDUNITS-2 include directories"
-)
-mark_as_advanced(UDUNITS2_INCLUDE)
-if(UDUNITS2_INCLUDE)
-    include_directories(${UDUNITS2_INCLUDE})
-endif()
-
-find_library(UDUNITS2_LIBRARY
-    NAMES libudunits2.so libudunits2.dylib
-)
-mark_as_advanced(UDUNITS2_LIBRARY)
-if(UDUNITS2_LIBRARY)
-    add_library(libudunits2 SHARED IMPORTED)
-    set_property(TARGET libudunits2 PROPERTY IMPORTED_LOCATION "${UDUNITS2_LIBRARY}")
-endif()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(UDUNITS2 DEFAULT_MSG UDUNITS2_LIBRARY UDUNITS2_INCLUDE)
\ No newline at end of file
diff --git a/docker/CENTOS_NGEN_RUN.dockerfile b/docker/CENTOS_NGEN_RUN.dockerfile
index 5009c74454..a2dbe92817 100644
--- a/docker/CENTOS_NGEN_RUN.dockerfile
+++ b/docker/CENTOS_NGEN_RUN.dockerfile
@@ -30,7 +30,9 @@ RUN git submodule update --init --recursive -- extern/pybind11
 
 WORKDIR /ngen
 
-RUN cmake -B /ngen -S .
+RUN cmake -DNGEN_WITH_NETCDF:BOOL=OFF \
+          -DNGEN_WITH_SQLITE:BOOL=OFF \
+          -B /ngen -S .
 
 RUN cmake --build . --target ngen
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index b2379a8d61..668d30877d 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
-
 include(${PROJECT_SOURCE_DIR}/cmake/dynamic_sourced_library.cmake)
 dynamic_sourced_cxx_library(core "${CMAKE_CURRENT_SOURCE_DIR}")
 
@@ -20,7 +18,7 @@ target_include_directories(core PUBLIC
         ${PROJECT_SOURCE_DIR}/extern/pybind11/include
         )
 
-if (${NGEN_ACTIVATE_PYTHON})
+if (NGEN_WITH_PYTHON)
     target_include_directories(core PUBLIC
             ${PROJECT_SOURCE_DIR}/include
             ${PROJECT_SOURCE_DIR}/include/simulation_time
@@ -60,6 +58,10 @@ else ()
             )
 endif ()
 
+if(NGEN_WITH_MPI)
+    target_link_libraries(core PUBLIC MPI::MPI_C MPI::MPI_CXX)
+endif()
+
 add_subdirectory("catchment")
 add_subdirectory("nexus")
 add_subdirectory("hydrolocation")
diff --git a/src/core/catchment/CMakeLists.txt b/src/core/catchment/CMakeLists.txt
index be2a4a7460..e0017d4d3f 100644
--- a/src/core/catchment/CMakeLists.txt
+++ b/src/core/catchment/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
-
 include(${PROJECT_SOURCE_DIR}/cmake/dynamic_sourced_library.cmake)
 dynamic_sourced_cxx_library(core_catchment "${CMAKE_CURRENT_SOURCE_DIR}")
 
diff --git a/src/core/hydrolocation/CMakeLists.txt b/src/core/hydrolocation/CMakeLists.txt
index af22d82b79..c6446c8810 100644
--- a/src/core/hydrolocation/CMakeLists.txt
+++ b/src/core/hydrolocation/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
-
 include(${PROJECT_SOURCE_DIR}/cmake/dynamic_sourced_library.cmake)
 dynamic_sourced_cxx_library(core_hydrolocation "${CMAKE_CURRENT_SOURCE_DIR}")
 
@@ -16,7 +14,3 @@ target_include_directories(core_hydrolocation PUBLIC
 target_link_libraries(core_hydrolocation PUBLIC
         Boost::boost                # Headers-only Boost
         )
-
-if(MPI_ACTIVE)
-    add_compile_definitions(NGEN_MPI_ACTIVE)
-endif()
diff --git a/src/core/mediator/CMakeLists.txt b/src/core/mediator/CMakeLists.txt
index da9167ae59..6384473db5 100644
--- a/src/core/mediator/CMakeLists.txt
+++ b/src/core/mediator/CMakeLists.txt
@@ -1,12 +1,10 @@
-cmake_minimum_required(VERSION 3.10)
-
 include(${PROJECT_SOURCE_DIR}/cmake/dynamic_sourced_library.cmake)
 dynamic_sourced_cxx_library(core_mediator "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_library(NGen::core_mediator ALIAS core_mediator)
-if(UDUNITS_ACTIVE)
-        add_dependencies(core_mediator libudunits2)
-        target_link_libraries(core_mediator PUBLIC libudunits2)
+
+if(NGEN_WITH_UDUNITS)
+    target_link_libraries(core_mediator PUBLIC libudunits2)
 endif()
 
 find_package(Threads REQUIRED)
diff --git a/src/core/nexus/CMakeLists.txt b/src/core/nexus/CMakeLists.txt
index 3102075d20..567ef9a6ea 100644
--- a/src/core/nexus/CMakeLists.txt
+++ b/src/core/nexus/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
-
 include(${PROJECT_SOURCE_DIR}/cmake/dynamic_sourced_library.cmake)
 dynamic_sourced_cxx_library(core_nexus "${CMAKE_CURRENT_SOURCE_DIR}")
 
@@ -18,6 +16,6 @@ target_link_libraries(core_nexus PUBLIC
         Boost::boost                # Headers-only Boost
         )
 
-if(MPI_ACTIVE)
-    add_compile_definitions(NGEN_MPI_ACTIVE)
+if(NGEN_WITH_MPI)
+    target_link_libraries(core_nexus PUBLIC MPI::MPI_C MPI::MPI_CXX)
 endif()
diff --git a/src/forcing/CMakeLists.txt b/src/forcing/CMakeLists.txt
index 2ce80a97a2..0390ac3389 100644
--- a/src/forcing/CMakeLists.txt
+++ b/src/forcing/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
-#set(CMAKE_CXX_STANDARD 14)
-#set(CMAKE_CXX_STANDARD_REQUIRED True)
-#set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-
 include(${PROJECT_SOURCE_DIR}/cmake/dynamic_sourced_library.cmake)
 dynamic_sourced_cxx_library(forcing "${CMAKE_CURRENT_SOURCE_DIR}")
 
@@ -21,6 +16,10 @@ target_include_directories(forcing PUBLIC
 target_link_libraries(forcing PUBLIC
         Boost::boost                # Headers-only Boost
         Threads::Threads
-        )
+)
+
+if(NGEN_WITH_NETCDF)
+    target_link_libraries(forcing PUBLIC NetCDF)
+endif()
 
 #target_compile_options(forcing PUBLIC -std=c++14 -Wall)
diff --git a/src/geojson/CMakeLists.txt b/src/geojson/CMakeLists.txt
index 92315eb7c6..dc2ff4a83b 100644
--- a/src/geojson/CMakeLists.txt
+++ b/src/geojson/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
 add_library(geojson STATIC
         JSONGeometry.cpp
         JSONProperty.cpp
diff --git a/src/geopackage/CMakeLists.txt b/src/geopackage/CMakeLists.txt
index 300b7b50db..574c516368 100644
--- a/src/geopackage/CMakeLists.txt
+++ b/src/geopackage/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
-
-
 string(COMPARE EQUAL "${CMAKE_CXX_COMPILER_ID}" "IntelLLVM" _cmp)
 if (NOT _cmp)
     message(WARNING "[NGen::geopackage] wkb.cpp cannot be optimized with "
diff --git a/src/realizations/catchment/CMakeLists.txt b/src/realizations/catchment/CMakeLists.txt
index a3d1c6f7b1..d62626d267 100644
--- a/src/realizations/catchment/CMakeLists.txt
+++ b/src/realizations/catchment/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
-
 include(${PROJECT_SOURCE_DIR}/cmake/dynamic_sourced_library.cmake)
 dynamic_sourced_cxx_library(realizations_catchment "${CMAKE_CURRENT_SOURCE_DIR}")
 
@@ -21,16 +19,10 @@ target_link_libraries(realizations_catchment PUBLIC
         NGen::geojson
         )
 
-if(NGEN_ACTIVATE_PYTHON)
+if(NGEN_WITH_PYTHON)
    target_link_libraries(realizations_catchment PUBLIC pybind11::embed)
 endif()
 
-##### Logic for Fortran integration
-# Go ahead and set these two cache variables, regardless of whether active currently
-SET(BMI_FORTRAN_ISO_C_LIB_DIR "${PROJECT_SOURCE_DIR}/extern/iso_c_fortran_bmi/cmake_build" CACHE STRING "Directory hint for middleware Fortran shared lib handling iso_c_binding")
-SET(BMI_FORTRAN_ISO_C_LIB_NAME "iso_c_bmi" CACHE STRING "Name for middleware Fortran shared lib handling iso_c_binding")
-# If Fortran is active, include linking to middleware shared library
-if (${BMI_FORTRAN_ACTIVE})
-   find_library(BMI_FORTRAN_ISO_C_LIB_PATH "${BMI_FORTRAN_ISO_C_LIB_NAME}" PATHS "${BMI_FORTRAN_ISO_C_LIB_DIR}")
-   target_link_libraries(realizations_catchment PRIVATE "${BMI_FORTRAN_ISO_C_LIB_PATH}")
+if(NGEN_WITH_BMI_FORTRAN)
+    target_link_libraries(realizations_catchment PUBLIC bmi_fortran_iso_c)
 endif()
diff --git a/src/routing/CMakeLists.txt b/src/routing/CMakeLists.txt
index 3b07ba038e..48993d72fe 100644
--- a/src/routing/CMakeLists.txt
+++ b/src/routing/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
-
 include(${PROJECT_SOURCE_DIR}/cmake/dynamic_sourced_library.cmake)
 dynamic_sourced_cxx_library(routing "${CMAKE_CURRENT_SOURCE_DIR}")
 
diff --git a/src/utilities/mdframe/CMakeLists.txt b/src/utilities/mdframe/CMakeLists.txt
index a4bd75e49d..1188f90b43 100644
--- a/src/utilities/mdframe/CMakeLists.txt
+++ b/src/utilities/mdframe/CMakeLists.txt
@@ -1,4 +1,8 @@
 add_library(mdframe handler_csv.cpp handler_netcdf.cpp)
 add_library(NGen::mdframe ALIAS mdframe)
 target_include_directories(mdframe PUBLIC ${PROJECT_SOURCE_DIR}/include/utilities)
-target_link_libraries(mdframe PRIVATE NGen::mdarray Boost::boost)
+target_link_libraries(mdframe PUBLIC NGen::mdarray Boost::boost)
+
+if(NGEN_WITH_NETCDF)
+    target_link_libraries(mdframe PUBLIC NetCDF)
+endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 115d5a86a8..d2c3d178b1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,300 +1,322 @@
-project(test)
-
-include(CTest)
 add_subdirectory(googletest)
-include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
-include_directories(${gmock_SOURCE_DIR}/include ${gmock_SOURCE_DIR})
-include_directories(${PROJ_ROOT_INCLUDE_DIR})
+add_compile_definitions(NGEN_BMI_CPP_LIB_TESTS_ACTIVE)
 
-if (NGEN_ACTIVATE_PYTHON)
-    include_directories(${PROJECT_SOURCE_DIR}/extern/pybind11/include)
+# Natively support BMI C++ modules and pre-compile in the test_bmi_cpp mock/example.
+set(TEST_BMI_CPP_DIR ${NGEN_EXT_DIR}/test_bmi_cpp)
+git_update_submodule(${NGEN_EXT_DIR}/bmi-cxx)
+add_subdirectory(${TEST_BMI_CPP_DIR} ${TEST_BMI_CPP_DIR}/cmake_build)
+add_dependencies(ngen testbmicppmodel)
+
+if (NGEN_WITH_PYTHON)
     add_compile_definitions(NGEN_BMI_PY_TESTS_ACTIVE)
 endif()
 
-if(MPI_ACTIVE)
+if(NGEN_WITH_MPI)
     add_compile_definitions(NGEN_MPI_TESTS_ACTIVE)
 endif()
 
-add_compile_definitions(NGEN_BMI_CPP_LIB_TESTS_ACTIVE)
-
-if(BMI_C_LIB_ACTIVE)
+if(NGEN_WITH_BMI_C)
     add_compile_definitions(NGEN_BMI_C_LIB_TESTS_ACTIVE)
 endif()
 
-if(BMI_FORTRAN_ACTIVE)
+if(NGEN_WITH_BMI_FORTRAN)
     add_compile_definitions(NGEN_BMI_FORTRAN_LIB_TESTS_ACTIVE)
 endif()
 
-if(NGEN_ACTIVATE_ROUTING)
+if(NGEN_WITH_ROUTING)
     add_compile_definitions(ROUTING_PYBIND_TESTS_ACTIVE)
 endif()
 
-if(NETCDF_ACTIVE)
+if(NGEN_WITH_NETCDF)
     add_compile_definitions(NETCDF_ACTIVE)
 endif()
 
-# Add test source files (e.g., test1.cpp)
-#add_executable(test_hymod models/hymod/include/HymodTest.cpp)
-#target_link_libraries(test_hymod gtest gtest_main)
+#[==[
+ngen_add_test(<test name> OBJECTS <source>...
+                          LIBRARIES <library>...
+                          [REQUIRES <varname>...])
+
+Adds an executable test (i.e. a target) called <test name>.
 
-function(add_test TESTNAME NUM_FILES)
-    math(EXPR NUM_LINKS "${ARGC} - ${NUM_FILES}")
-    list(SUBLIST ARGN 0 ${NUM_FILES} SOURCE_FILES)
-    list(SUBLIST ARGN ${NUM_FILES} ${NUM_LINKS} LINKED_LIBS)
+`OBJECTS`
+    Source files containing the test cases/fixtures.
 
-    # Also link these testing libraries for anything
-    # TODO: verify these do not remove current value at i = 0, but instead push it forward
-    list(INSERT LINKED_LIBS 0 gtest gtest_main)
+`LIBRARIES`
+    Library targets that this test requires linking to.
 
-    # Sanity check for duplicates
-    list(REMOVE_DUPLICATES LINKED_LIBS)
+`REQUIRES`
+    Variable names that this test's creation is dependent on.
+    If a given variable is not defined or is FALSE/OFF/etc. then
+    the corresponding <test name> target is not created.
+#]==]
+function(ngen_add_test TESTNAME)
+    set(multiValueArgs OBJECTS LIBRARIES REQUIRES)
+    cmake_parse_arguments(NGEN_TEST "" "" "${multiValueArgs}" ${ARGN})
 
-    # Create the testing executable target and link the libraries
-    add_executable(${TESTNAME} ${SOURCE_FILES})
-    target_link_libraries(${TESTNAME} ${LINKED_LIBS})
+    list(REMOVE_DUPLICATES NGEN_TEST_LIBRARIES)
 
-    # Perform the final GoogleTest boilerplate steps
-    gtest_discover_tests(${TESTNAME}
+    set(NGEN_TEST_CREATE ON)
+    foreach(requirement_var IN LISTS NGEN_TEST_REQUIRES)
+        if(NOT ${requirement_var})
+            set(NGEN_TEST_CREATE OFF)
+            break()
+        endif()
+    endforeach()
+
+    if(NGEN_TEST_CREATE)
+        add_executable(${TESTNAME} ${NGEN_TEST_OBJECTS})
+        target_link_libraries(${TESTNAME} PUBLIC gtest gtest_main ${NGEN_TEST_LIBRARIES})
+        set_target_properties(${TESTNAME} PROPERTIES FOLDER test)
+        gtest_discover_tests(
+            ${TESTNAME}
             WORKING_DIRECTORY ${PROJECT_DIR}
-            PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${PROJECT_DIR}"
-            )
-    set_target_properties(${TESTNAME} PROPERTIES FOLDER test)
+            PROPERTIES
+                VS_DEBUGGER_WORKING_DIRECTORY "${PROJECT_DIR}"
+        )
+    endif()
 endfunction()
 
 ########################## Individual tests ##########################
 
 ########################## GeoJSON Unit Tests
-add_test(test_geojson
-        4
+ngen_add_test(
+    test_geojson
+    OBJECTS
         geojson/JSONProperty_Test.cpp
         geojson/JSONGeometry_Test.cpp
         geojson/Feature_Test.cpp
         geojson/FeatureCollection_Test.cpp
+    LIBRARIES
         NGen::geojson
-        )
+)
 
 ########################## GeoPackage Unit Tests
-if(NGEN_WITH_SQLITE3)
-add_test(test_geopackage
-        3
+ngen_add_test(
+    test_geopackage
+    OBJECTS
         geopackage/WKB_Test.cpp
         geopackage/SQLite_Test.cpp
         geopackage/GeoPackage_Test.cpp
-        NGen::geopackage)
-endif()
+    LIBRARIES
+        NGen::geopackage
+    REQUIRES
+        NGEN_WITH_SQLITE
+)
 
 ########################## Realization Config Unit Tests
-add_test(test_realization_config
-        1
+ngen_add_test(
+    test_realization_config
+    OBJECTS
         realizations/Formulation_Manager_Test.cpp
+    LIBRARIES
         NGen::core
         NGen::realizations_catchment
         NGen::core_mediator
         NGen::forcing
-        libudunits2
         testbmicppmodel
-        ${NETCDF_LIBRARIES}
+        
 )
 
 ########################## Series Unit Tests
-add_test(test_mdarray
-         4
-         utils/mdarray_Test.cpp
-         utils/mdframe_Test.cpp
-         utils/mdframe_netcdf_Test.cpp
-         utils/mdframe_csv_Test.cpp
-         NGen::mdarray
-         NGen::mdframe
-         ${NETCDF_LIBRARIES})
+ngen_add_test(
+    test_mdarray
+    OBJECTS
+        utils/mdarray_Test.cpp
+        utils/mdframe_Test.cpp
+        utils/mdframe_netcdf_Test.cpp
+        utils/mdframe_csv_Test.cpp
+    LIBRARIES
+        NGen::mdarray
+        NGen::mdframe
+        
+)
 
 ########################## Nexus Tests
-add_test(
-        test_nexus
-        1
+ngen_add_test(
+    test_nexus
+    OBJECTS
         core/nexus/NexusTests.cpp
+    LIBRARIES
         NGen::core_nexus
 )
 
 ########################## MPI Remote Nexus Tests
-if(MPI_ACTIVE)
-   add_test(
-           test_remote_nexus
-           1
-           core/nexus/NexusRemoteTests.cpp
-           NGen::core_nexus
-   )
-endif()
+ngen_add_test(
+    test_remote_nexus
+    OBJECTS
+        core/nexus/NexusRemoteTests.cpp
+    LIBRARIES
+        NGen::core_nexus
+    REQUIRES
+        NGEN_WITH_MPI
+)
 
 ########################## Partitioning Tests
-#if(MPI_ACTIVE)
-   #TODO this test depends on a "reference hydrofabric" that is rather large
-   #and the path to that reference is absolute in the test code.  Need to rethink this.
-   add_test(
-           test_partition
-           1
-           utils/Partition_Test.cpp
-           NGen::core
-           NGen::geojson
+ngen_add_test(
+    test_partition
+    OBJECTS
+        utils/Partition_Test.cpp
+    LIBRARIES
+        gmock
+        NGen::core
+        NGen::geojson
+    # REQUIRES
+    #   NGEN_WITH_MPI
 )
-#endif()
 
 ########################## BMI C++ Tests
-add_test(
-        test_bmi_cpp
-        2
+ngen_add_test(
+    test_bmi_cpp
+    OBJECTS
         realizations/catchments/Bmi_Cpp_Adapter_Test.cpp
         realizations/catchments/Bmi_Cpp_Formulation_Test.cpp
+    LIBRARIES
         NGen::core
         NGen::realizations_catchment
         NGen::core_mediator
         NGen::forcing
-        libudunits2
-        ${NETCDF_LIBRARIES}
 )
 
 ########################## BMI C Tests
-if(BMI_C_LIB_ACTIVE)
-    add_test(
-            test_bmi_c
-            2
-            realizations/catchments/Bmi_C_Adapter_Test.cpp
-            realizations/catchments/Bmi_C_Formulation_Test.cpp
-            NGen::core
-            NGen::realizations_catchment
-            NGen::core_mediator
-            NGen::forcing
-            libudunits2
-            ${NETCDF_LIBRARIES}
-    )
-endif()
+ngen_add_test(
+    test_bmi_c
+    OBJECTS
+        realizations/catchments/Bmi_C_Adapter_Test.cpp
+        realizations/catchments/Bmi_C_Formulation_Test.cpp
+    LIBRARIES
+        gmock
+        NGen::core
+        NGen::realizations_catchment
+        NGen::core_mediator
+        NGen::forcing
+    REQUIRES
+        NGEN_WITH_BMI_C
+)
 
 ########################## BMI Fortran Tests
-if (${BMI_FORTRAN_ACTIVE})
-    add_test(
-            test_bmi_fortran
-            2
-            realizations/catchments/Bmi_Fortran_Adapter_Test.cpp
-            realizations/catchments/Bmi_Fortran_Formulation_Test.cpp
-            NGen::core
-            NGen::realizations_catchment
-            NGen::core_mediator
-            NGen::forcing
-            libudunits2
-            ${NETCDF_LIBRARIES}
-    )
-endif()
+ngen_add_test(
+    test_bmi_fortran
+    OBJECTS
+        realizations/catchments/Bmi_Fortran_Adapter_Test.cpp
+        realizations/catchments/Bmi_Fortran_Formulation_Test.cpp
+    LIBRARIES
+        NGen::core
+        NGen::realizations_catchment
+        NGen::core_mediator
+        NGen::forcing
+    REQUIRES
+        NGEN_WITH_BMI_FORTRAN
+)
 
 ########################## BMI Python Tests
-if (${NGEN_ACTIVATE_PYTHON})
-    add_test(
-            test_bmi_python
-            2
-            realizations/catchments/Bmi_Py_Adapter_Test.cpp
-            realizations/catchments/Bmi_Py_Formulation_Test.cpp
-            NGen::core
-            NGen::realizations_catchment
-            NGen::core_mediator
-            NGen::forcing
-            libudunits2
-            ${NETCDF_LIBRARIES}
-    )
-endif()
+ngen_add_test(
+    test_bmi_python
+    OBJECTS
+        realizations/catchments/Bmi_Py_Adapter_Test.cpp
+        realizations/catchments/Bmi_Py_Formulation_Test.cpp
+    LIBRARIES
+        NGen::core
+        NGen::realizations_catchment
+        NGen::core_mediator
+        NGen::forcing
+    REQUIRES
+        NGEN_WITH_PYTHON
+)
 
 ########################## BMI Multi Tests
-add_test(
-        test_bmi_multi
-        2
+ngen_add_test(
+    test_bmi_multi
+    OBJECTS
         realizations/catchments/Bmi_Multi_Formulation_Test.cpp
         realizations/catchments/Bmi_Cpp_Multi_Array_Test.cpp
+    LIBRARIES
         NGen::core
         NGen::realizations_catchment
         NGen::core_mediator
         NGen::forcing
-        libudunits2
-        ${NETCDF_LIBRARIES}
 )
 
 ########################## All BMI Unit Tests
-if(BMI_C_LIB_ACTIVE)
-    if (${BMI_FORTRAN_ACTIVE})
-        if (${NGEN_ACTIVATE_PYTHON})
-            add_test(
-                    test_bmi_unit_all
-                    7
-                    realizations/catchments/Bmi_C_Adapter_Test.cpp
-                    realizations/catchments/Bmi_C_Formulation_Test.cpp
-                    realizations/catchments/Bmi_Fortran_Adapter_Test.cpp
-                    realizations/catchments/Bmi_Fortran_Formulation_Test.cpp
-                    realizations/catchments/Bmi_Py_Adapter_Test.cpp
-                    realizations/catchments/Bmi_Py_Formulation_Test.cpp
-                    realizations/catchments/Bmi_Multi_Formulation_Test.cpp
-                    NGen::core
-                    NGen::realizations_catchment
-                    NGen::core_mediator
-                    NGen::forcing
-                    libudunits2
-                    ${NETCDF_LIBRARIES}
-            )
-        endif()
-    endif()
-endif()
+ngen_add_test(
+    test_bmi_unit_all
+    OBJECTS
+        realizations/catchments/Bmi_C_Adapter_Test.cpp
+        realizations/catchments/Bmi_C_Formulation_Test.cpp
+        realizations/catchments/Bmi_Fortran_Adapter_Test.cpp
+        realizations/catchments/Bmi_Fortran_Formulation_Test.cpp
+        realizations/catchments/Bmi_Py_Adapter_Test.cpp
+        realizations/catchments/Bmi_Py_Formulation_Test.cpp
+        realizations/catchments/Bmi_Multi_Formulation_Test.cpp
+    LIBRARIES
+        gmock
+        NGen::core
+        NGen::realizations_catchment
+        NGen::core_mediator
+        NGen::forcing
+    REQUIRES
+        NGEN_WITH_BMI_C
+        NGEN_WITH_BMI_FORTRAN
+        NGEN_WITH_PYTHON
+)
 
 ########################## Comparison tests for the BMI PET implementation
 # TODO: this probably needs to be added to integration testing also
-add_test(
-        compare_pet
-        1
+ngen_add_test(
+    compare_pet
+    OBJECTS
         realizations/catchments/Bmi_C_Pet_IT.cpp
+    LIBRARIES
         NGen::core
         NGen::realizations_catchment
         NGen::core_mediator
         NGen::forcing
-        libudunits2
-        ${NETCDF_LIBRARIES}
 )
 
 ########################## Routing Tests
-if(NGEN_ACTIVATE_ROUTING)
-    add_test(
-            test_routing_pybind
-            1
-            routing/Routing_Py_Bind_Test.cpp
-            NGen::core # for filechecker utility
-            NGen::routing
-            pybind11::embed
-    )
-endif()
+ngen_add_test(
+    test_routing_pybind
+    OBJECTS
+        routing/Routing_Py_Bind_Test.cpp
+    LIBRARIES
+        NGen::core # for filechecker utility
+        NGen::routing
+        pybind11::embed
+    REQUIRES
+        NGEN_WITH_ROUTING
+)
 
 ########################## Network Class Tests
-add_test(
-        test_network
-        1
+ngen_add_test(
+    test_network
+    OBJECTS
         core/NetworkTests.cpp
+    LIBRARIES
         NGen::core
         NGen::geojson
 )
 
 ########################### Netcdf Forcing Tests
 #if(NETCDF_ACTIVE)
-add_test(
-        test_netcdf_forcing
-        1
+ngen_add_test(
+    test_netcdf_forcing
+    OBJECTS
         forcing/NetCDFPerFeatureDataProvider_Test.cpp
+    LIBRARIES
         NGen::core
         NGen::core_nexus
         NGen::core_mediator
         NGen::forcing
         NGen::geojson
         NGen::realizations_catchment
-        libudunits2
-        ${NETCDF_LIBRARIES}
+    REQUIRES
+        NGEN_WITH_NETCDF
 )
 #endif()
 
 ########################## Primary Combined Unit Test Target
-add_test(
-        test_unit
-        17
+ngen_add_test(
+    test_unit
+    OBJECTS
         geojson/JSONProperty_Test.cpp
         geojson/JSONGeometry_Test.cpp
         geojson/Feature_Test.cpp
@@ -312,6 +334,8 @@ add_test(
         utils/mdframe_Test.cpp
         utils/mdframe_netcdf_Test.cpp
         utils/mdframe_csv_Test.cpp
+    LIBRARIES
+        gmock
         NGen::core
         NGen::core_nexus
         NGen::core_mediator
@@ -320,15 +344,14 @@ add_test(
         NGen::realizations_catchment
         NGen::mdarray
         NGen::mdframe
-        libudunits2
         testbmicppmodel
-        ${NETCDF_LIBRARIES}
+        
 )
 
 # All automated tests
-add_test(
-        test_all
-        16
+ngen_add_test(
+    test_all
+    OBJECTS
         geojson/JSONProperty_Test.cpp
         geojson/JSONGeometry_Test.cpp
         geojson/Feature_Test.cpp
@@ -345,6 +368,7 @@ add_test(
         utils/mdframe_Test.cpp
         utils/mdframe_netcdf_Test.cpp
         utils/mdframe_csv_Test.cpp
+    LIBRARIES
         NGen::core
         gmock
         NGen::core_nexus
@@ -354,7 +378,5 @@ add_test(
         NGen::realizations_catchment
         NGen::mdarray
         NGen::mdframe
-        libudunits2
         testbmicppmodel
-        ${NETCDF_LIBRARIES}
 )