Actually, this is better, especially since we will want 0 extra steps…

… to get test_bmi_cpp for example realization config purposes.

.github/workflows/test_and_validate.yml

@@ -33,17 +33,6 @@ jobs:
     - name: Checkout the commit
       uses: actions/checkout@v2
 
-    - uses: ./.github/actions/ngen-submod-build
-      with: 
-        mod-dir: "extern/bmi-cxx/"
-
-    - name: Build test_bmi_cpp
-      id: submod_build_test_bmi_cpp
-      uses: ./.github/actions/ngen-submod-build
-      with: 
-        mod-dir: "extern/test_bmi_cpp/"
-        targets: "testbmicppmodel"
-
     - name: Build Unit Tests
       uses: ./.github/actions/ngen-build
       with:

CMakeLists.txt

@@ -139,6 +139,12 @@ 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

test/CMakeLists.txt

@@ -90,6 +90,7 @@ add_test(test_realization_config
         NGen::core_mediator
         NGen::forcing
         libudunits2
+        testbmicppmodel
         ${NETCDF_LIBRARIES}
 )
 
@@ -301,6 +302,7 @@ add_test(
         NGen::geojson
         NGen::realizations_catchment
         libudunits2
+        testbmicppmodel
         ${NETCDF_LIBRARIES}
 )
 
@@ -328,5 +330,6 @@ add_test(
         NGen::geojson
         NGen::realizations_catchment
         libudunits2
+        testbmicppmodel
         ${NETCDF_LIBRARIES}
 )