From adbb0d801bec1b77a53f1aab0ffa572c7fbb32e2 Mon Sep 17 00:00:00 2001
From: Edward Hartnett <Edward.Hartnett@noaa.gov>
Date: Mon, 31 Aug 2020 11:10:02 -0600
Subject: [PATCH 1/3] removed flags from fortran cmake build

---
 src/clib/CMakeLists.txt | 6 ------
 src/flib/CMakeLists.txt | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/src/clib/CMakeLists.txt b/src/clib/CMakeLists.txt
index 945d2b7dba6..68d801907a0 100644
--- a/src/clib/CMakeLists.txt
+++ b/src/clib/CMakeLists.txt
@@ -112,12 +112,6 @@ if (PnetCDF_C_FOUND)
 
   # Check library for varn functions
   set (CMAKE_REQUIRED_LIBRARIES ${PnetCDF_C_LIBRARY})
-  # check_function_exists (ncmpi_get_varn PnetCDF_C_HAS_VARN)
-  # if (PnetCDF_C_HAS_VARN)
-  #   target_compile_definitions(pioc
-  #     PUBLIC USE_PNETCDF_VARN
-  #     PUBLIC USE_PNETCDF_VARN_ON_READ)
-  # endif()
 endif ()
 
 #===== Add EXTRAs =====
diff --git a/src/flib/CMakeLists.txt b/src/flib/CMakeLists.txt
index 506981ddc98..99a9ba7cf75 100644
--- a/src/flib/CMakeLists.txt
+++ b/src/flib/CMakeLists.txt
@@ -229,12 +229,6 @@ if (PnetCDF_Fortran_FOUND)
 
   # Check library for varn functions
   set (CMAKE_REQUIRED_LIBRARIES ${PnetCDF_Fortran_LIBRARY})
-  check_function_exists (ncmpi_get_varn PnetCDF_Fortran_HAS_VARN)
-  if (PnetCDF_Fortran_HAS_VARN)
-    target_compile_definitions(piof
-      PUBLIC USE_PNETCDF_VARN
-      PUBLIC USE_PNETCDF_VARN_ON_READ)
-  endif()
 endif ()
 
 #===== Add EXTRAs =====

From c6c613863cf841ff0e95853accf9da8bee825918 Mon Sep 17 00:00:00 2001
From: Edward Hartnett <Edward.Hartnett@noaa.gov>
Date: Mon, 31 Aug 2020 11:12:22 -0600
Subject: [PATCH 2/3] added cmake build to a4.yml

---
 .github/workflows/a4.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/a4.yml b/.github/workflows/a4.yml
index a0e7ad96415..6066fb33623 100644
--- a/.github/workflows/a4.yml
+++ b/.github/workflows/a4.yml
@@ -128,4 +128,18 @@ jobs:
         autoreconf -i
         ./configure --enable-fortran
         make -j check
+    - name: cmake build
+      run: |
+        set -x
+        echo 'export PATH=/home/runner/mpich/bin:$PATH' > .bashrc
+        source .bashrc
+        export CC=mpicc
+        mkdir build
+        cd build
+        export LD_LIBRARY_PATH="/home/runner/netcdf-c/lib:/home/runner/pnetcdf/lib:/home/runner/hdf5/lib:/home/runner/mpich/lib:$LD_LIBRARY_PATH"
+        cmake -Wno-dev -DNetCDF_C_LIBRARY=/home/runner/netcdf-c/lib/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/home/runner/netcdf-c/include -DPnetCDF_PATH='/home/runner/pnetcdf' -DPIO_ENABLE_FORTRAN=Off -DPIO_HDF5_LOGGING=On -DPIO_USE_MALLOC=On -DPIO_ENABLE_LOGGING=On -DPIO_ENABLE_TIMING=Off .. || (cat CMakeFiles/CMakeOutput.log && cat CMakeFiles/CMakeError.log)
+        cat config.h
+        make VERBOSE=1
+        make tests VERBOSE=1
+        ctest -VV
         

From 261d8b6fe2b50fa22bdd6abc5b4384dd17741f54 Mon Sep 17 00:00:00 2001
From: Edward Hartnett <Edward.Hartnett@noaa.gov>
Date: Mon, 31 Aug 2020 12:12:44 -0600
Subject: [PATCH 3/3] increased time-out

---
 tests/cunit/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cunit/CMakeLists.txt b/tests/cunit/CMakeLists.txt
index 599754a708c..947c8108658 100644
--- a/tests/cunit/CMakeLists.txt
+++ b/tests/cunit/CMakeLists.txt
@@ -155,7 +155,7 @@ endif ()
 if (PIO_VALGRIND_CHECK)
   set (DEFAULT_TEST_TIMEOUT 480)
 else ()
-  set (DEFAULT_TEST_TIMEOUT 240)
+  set (DEFAULT_TEST_TIMEOUT 480)
 endif ()
 
 # All tests need a certain number of tasks, but they should be able to