From f027bcee308cf3f21802c403ea3bd506a49f9ade Mon Sep 17 00:00:00 2001
From: Ed <edward.hartnett@noaa.gov>
Date: Fri, 30 Aug 2024 10:11:12 -0600
Subject: [PATCH] fixing cmake build

---
 CMakeLists.txt              | 26 +++++++++++++++-----------
 configure.ac                |  2 +-
 nc_test4/run_par_test.sh.in |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27edd4d6ab..bc2f2e4acd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -948,17 +948,6 @@ if(NETCDF_ENABLE_PARALLEL4 AND NETCDF_ENABLE_HDF5)
       set(MPIEXEC "${NETCDF_MPIEXEC}")
     endif()
     message(STATUS "MPIEXEC command will be ${MPIEXEC}")
-    configure_file("${netCDF_SOURCE_DIR}/nc_test4/run_par_test.sh.in"
-      "${netCDF_BINARY_DIR}/tmp/run_par_test.sh" @ONLY NEWLINE_STYLE LF)
-    file(COPY "${netCDF_BINARY_DIR}/tmp/run_par_test.sh"
-      DESTINATION ${netCDF_BINARY_DIR}/nc_test4
-      FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-    configure_file("${netCDF_SOURCE_DIR}/h5_test/run_par_tests.sh.in"
-      "${netCDF_BINARY_DIR}/tmp/run_par_tests.sh" @ONLY NEWLINE_STYLE LF)
-    file(COPY "${netCDF_BINARY_DIR}/tmp/run_par_tests.sh"
-      DESTINATION ${netCDF_BINARY_DIR}/h5_test
-      FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-    set(IMPORT_MPI "include(CMakeFindDependencyMacro)\nfind_dependency(MPI COMPONENTS C)")
   endif()
 endif()
 
@@ -1758,6 +1747,21 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in"
   "${CMAKE_CURRENT_BINARY_DIR}/libnetcdf.settings"
   @ONLY)
 
+if(NETCDF_ENABLE_PARALLEL4 AND NETCDF_ENABLE_HDF5)
+  if(HDF5_PARALLEL)
+    configure_file("${netCDF_SOURCE_DIR}/nc_test4/run_par_test.sh.in"
+      "${netCDF_BINARY_DIR}/tmp/run_par_test.sh" @ONLY NEWLINE_STYLE LF)
+    file(COPY "${netCDF_BINARY_DIR}/tmp/run_par_test.sh"
+      DESTINATION ${netCDF_BINARY_DIR}/nc_test4
+      FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+    configure_file("${netCDF_SOURCE_DIR}/h5_test/run_par_tests.sh.in"
+      "${netCDF_BINARY_DIR}/tmp/run_par_tests.sh" @ONLY NEWLINE_STYLE LF)
+    file(COPY "${netCDF_BINARY_DIR}/tmp/run_par_tests.sh"
+      DESTINATION ${netCDF_BINARY_DIR}/h5_test
+      FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+  endif()
+endif()
+
 # Read in settings file, print out.
 # Avoid using system-specific calls so that this
 # might also work on Windows.
diff --git a/configure.ac b/configure.ac
index e5098f04d3..e923cd71ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -785,7 +785,7 @@ else
    have_zstd=no
 fi
 AC_MSG_CHECKING([whether we are going to build with zstd])
-AC_SUBST([HAVE_ZSTD], [$have_zstd])
+AC_SUBST([HAS_ZSTD], [$have_zstd])
 AC_MSG_RESULT([$have_zstd])
 
 ##
diff --git a/nc_test4/run_par_test.sh.in b/nc_test4/run_par_test.sh.in
index 43e8056229..3746c0be49 100644
--- a/nc_test4/run_par_test.sh.in
+++ b/nc_test4/run_par_test.sh.in
@@ -10,7 +10,7 @@ set -e
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-if test "x@HAVE_ZSTD@" = "xyes" ; then
+if test "x@HAS_ZSTD@" = "xyes" ; then
   # Load the findplugins function
   . ${builddir}/findplugin.sh
   echo "findplugin.sh loaded"