Hdf5 1 12 1 merge cmake and java changes (#735)

* Disable test because of failures on some platforms

* if blocks needed for build modes

* Merge fortran and java changes

Fortran config tests now work with ccmake
C language config test moved from fortran to ConfigureChecks
Fixed generated files for ninja build system
Added java id creation to id logger
Fixed tools test argument comparator

20 files changed, 317 insertions, 348 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 78e1115..ae429a2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,7 +36,7 @@ jobs:
             os: ubuntu-latest
             build_type: "Release"
             cpp: ON
-            fortran: OFF
+            fortran: ON
             java: ON
             ts: OFF
             hl: ON
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index b50bf59..0acaf2d 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -31,7 +31,7 @@ jobs:
             os: ubuntu-latest
             build_type: "Release"
             cpp: ON
-            fortran: OFF
+            fortran: ON
             java: ON
             ts: OFF
             hl: ON
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 9fc4680..6983786 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -233,18 +233,125 @@ endif()
 # Check if C has __float128 extension
 #-----------------------------------------------------------------------------
 
-CHECK_TYPE_SIZE("__float128" ${HDF_PREFIX}_SIZEOF___FLOAT128)
-if (${${HDF_PREFIX}_SIZEOF___FLOAT128})
+HDF_CHECK_TYPE_SIZE(__float128 _SIZEOF___FLOAT128)
+if (${_SIZEOF___FLOAT128})
   set (${HDF_PREFIX}_HAVE_FLOAT128 1)
+  set (${HDF_PREFIX}_SIZEOF___FLOAT128 ${_SIZEOF___FLOAT128})
 else ()
   set (${HDF_PREFIX}_HAVE_FLOAT128 0)
   set (${HDF_PREFIX}_SIZEOF___FLOAT128 0)
 endif ()
 
-CHECK_TYPE_SIZE("_Quad" ${HDF_PREFIX}_SIZEOF__QUAD)
-if (NOT ${${HDF_PREFIX}_SIZEOF__QUAD})
+HDF_CHECK_TYPE_SIZE(_Quad _SIZEOF__QUAD)
+if (NOT ${_SIZEOF__QUAD})
   set (${HDF_PREFIX}_SIZEOF__QUAD 0)
+else ()
+  set (${HDF_PREFIX}_SIZEOF__QUAD ${_SIZEOF__QUAD})
+endif ()
+
+#-----------------------------------------------------------------------------
+# The provided CMake C macros don't provide a general compile/run function
+# so this one is used.
+#-----------------------------------------------------------------------------
+macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR)
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "Detecting C ${FUNCTION_NAME}")
+    endif ()
+    file (WRITE
+        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler1.c
+        ${SOURCE_CODE}
+    )
+    TRY_RUN (RUN_RESULT_VAR COMPILE_RESULT_VAR
+        ${CMAKE_BINARY_DIR}
+        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler1.c
+        COMPILE_DEFINITIONS "-D_SIZEOF___FLOAT128=${H5_SIZEOF___FLOAT128};-D_HAVE_QUADMATH_H=${H5_HAVE_QUADMATH_H}"
+        COMPILE_OUTPUT_VARIABLE COMPILEOUT
+        RUN_OUTPUT_VARIABLE OUTPUT_VAR
+    )
+
+    set (${RETURN_VAR} ${OUTPUT_VAR})
+
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
+      message (VERBOSE "Test COMPILE_RESULT_VAR ${COMPILE_RESULT_VAR} ")
+      message (VERBOSE "Test COMPILE_OUTPUT ${COMPILEOUT} ")
+      message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
+      message (VERBOSE "Test RUN_RESULT_VAR ${RUN_RESULT_VAR} ")
+      message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
+    endif ()
+
+    if (${COMPILE_RESULT_VAR})
+      if (${RUN_RESULT_VAR} MATCHES 0)
+        set (${RUN_RESULT_VAR} 1 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
+        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+          message (VERBOSE "Testing C ${FUNCTION_NAME} - OK")
+        endif ()
+        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+            "Determining if the C ${FUNCTION_NAME} exists passed with the following output:\n"
+            "${OUTPUT_VAR}\n\n"
+        )
+      else ()
+        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+          message (VERBOSE "Testing C ${FUNCTION_NAME} - Fail")
+        endif ()
+        set (${RUN_RESULT_VAR} 0 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
+        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+            "Determining if the C ${FUNCTION_NAME} exists failed with the following output:\n"
+            "${OUTPUT_VAR}\n\n")
+      endif ()
+    else ()
+        message (FATAL_ERROR "Compilation of C ${FUNCTION_NAME} - Failed")
+    endif ()
+endmacro ()
+
+set (PROG_SRC
+    "
+#include <float.h>\n\
+#include <stdio.h>\n\
+#define CHECK_FLOAT128 _SIZEOF___FLOAT128\n\
+#if CHECK_FLOAT128!=0\n\
+#if _HAVE_QUADMATH_H!=0\n\
+#include <quadmath.h>\n\
+#endif\n\
+#ifdef FLT128_DIG\n\
+#define C_FLT128_DIG FLT128_DIG\n\
+#else\n\
+#define C_FLT128_DIG 0\n\
+#endif\n\
+#else\n\
+#define C_FLT128_DIG 0\n\
+#endif\n\
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L\n\
+#define C_LDBL_DIG DECIMAL_DIG\n\
+#else\n\
+#define C_LDBL_DIG LDBL_DIG\n\
+#endif\n\nint main() {\nFILE *pFile = fopen(\"pac_Cconftest.out\",\"w\")\\\;\nfprintf(pFile, \"\\%d\\\;\\%d\\\;\", C_LDBL_DIG, C_FLT128_DIG)\\\;\n\nreturn 0\\\;\n}\n
+     "
+)
+
+C_RUN ("maximum decimal precision for C" ${PROG_SRC} PROG_RES)
+file (READ "${CMAKE_BINARY_DIR}/pac_Cconftest.out" PROG_OUTPUT4)
+message (STATUS "Testing maximum decimal precision for C - ${PROG_OUTPUT4}")
+
+# dnl The output from the above program will be:
+# dnl  -- long double decimal precision  --  __float128 decimal precision
+
+list (GET PROG_OUTPUT4 0 H5_LDBL_DIG)
+list (GET PROG_OUTPUT4 1 H5_FLT128_DIG)
+
+if (${HDF_PREFIX}_SIZEOF___FLOAT128 EQUAL 0 OR FLT128_DIG EQUAL 0)
+  set (${HDF_PREFIX}_HAVE_FLOAT128 0)
+  set (${HDF_PREFIX}_SIZEOF___FLOAT128 0)
+  set (_PAC_C_MAX_REAL_PRECISION ${H5_LDBL_DIG})
+else ()
+  set (_PAC_C_MAX_REAL_PRECISION ${H5_FLT128_DIG})
+endif ()
+if (NOT ${_PAC_C_MAX_REAL_PRECISION})
+  set (${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION 0)
+else ()
+  set (${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION ${_PAC_C_MAX_REAL_PRECISION})
 endif ()
+message (STATUS "maximum decimal precision for C var - ${${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION}")
 
 #-----------------------------------------------------------------------------
 # Macro to determine the various conversion capabilities
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 97731f1..5ad0a7a 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -32,7 +32,7 @@
 /* Define the default plugins path to compile */
 #cmakedefine H5_DEFAULT_PLUGINDIR "@H5_DEFAULT_PLUGINDIR@"
 
-/* Define if `dev_t' is a scalar */
+/* Define if dev_t is a scalar */
 #cmakedefine H5_DEV_T_IS_SCALAR @H5_DEV_T_IS_SCALAR@
 
 /* Define to dummy `main' function (if any) required to link to the Fortran
@@ -88,6 +88,9 @@
 /* Define to 1 if you have the `alarm' function. */
 #cmakedefine H5_HAVE_ALARM @H5_HAVE_ALARM@
 
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#cmakedefine H5_HAVE_ARPA_INET_H @H5_HAVE_ARPA_INET_H@
+
 /* Define to 1 if you have the `asprintf' function. */
 #cmakedefine H5_HAVE_ASPRINTF @H5_HAVE_ASPRINTF@
 
@@ -101,9 +104,6 @@
 /* Define if the compiler understands the __func__ keyword */
 #cmakedefine H5_HAVE_C99_FUNC @H5_HAVE_C99_FUNC@
 
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#cmakedefine H5_HAVE_ARPA_INET_H @H5_HAVE_ARPA_INET_H@
-
 /* Define to 1 if you have the `clock_gettime' function. */
 #cmakedefine H5_HAVE_CLOCK_GETTIME @H5_HAVE_CLOCK_GETTIME@
 
@@ -270,7 +270,7 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #cmakedefine H5_HAVE_MEMORY_H @H5_HAVE_MEMORY_H@
 
-/* Define if we can build the Mirror VFD */
+/* Define whether the Mirror virtual file driver (VFD) will be compiled */
 #cmakedefine H5_HAVE_MIRROR_VFD @H5_HAVE_MIRROR_VFD@
 
 /* Define if we have MPE support */
@@ -279,10 +279,10 @@
 /* Define to 1 if you have the <mpe.h> header file. */
 #cmakedefine H5_HAVE_MPE_H @H5_HAVE_MPE_H@
 
-/* Define if MPI_Comm_c2f and MPI_Comm_f2c exists */
+/* Define if MPI_Comm_c2f and MPI_Comm_f2c exist */
 #cmakedefine H5_HAVE_MPI_MULTI_LANG_Comm @H5_HAVE_MPI_MULTI_LANG_Comm@
 
-/* Define if MPI_Info_c2f and MPI_Info_f2c exists */
+/* Define if MPI_Info_c2f and MPI_Info_f2c exist */
 #cmakedefine H5_HAVE_MPI_MULTI_LANG_Info @H5_HAVE_MPI_MULTI_LANG_Info@
 
 /* Define to 1 if you have the <netdb.h> header file. */
@@ -486,7 +486,7 @@
 /* Define if the compiler understands __inline__ */
 #cmakedefine H5_HAVE___INLINE__ @H5_HAVE___INLINE__@
 
-/* Define if the library will ignore file locks when disabled */                 
+/* Define if the library will ignore file locks when disabled */
 #cmakedefine H5_IGNORE_DISABLED_FILE_LOCKS @H5_IGNORE_DISABLED_FILE_LOCKS@
 
 /* Define if the high-level library headers should be included in hdf5.h */
diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake
index 003f24f..e192ec4 100644
--- a/config/cmake/HDF5UseFortran.cmake
+++ b/config/cmake/HDF5UseFortran.cmake
@@ -129,74 +129,12 @@ endif ()
 # Determine the available KINDs for REALs and INTEGERs
 #-----------------------------------------------------------------------------
 
-#READ_SOURCE ("PROGRAM FC_AVAIL_KINDS" "END PROGRAM FC_AVAIL_KINDS" SOURCE_CODE)
-set (PROG_SRC_CODE
-  "
-       PROGRAM FC_AVAIL_KINDS
-          IMPLICIT NONE
-          INTEGER :: ik, jk, k, max_decimal_prec
-          INTEGER :: num_rkinds = 1, num_ikinds = 1
-          INTEGER, DIMENSION(1:10) :: list_ikinds = -1
-          INTEGER, DIMENSION(1:10) :: list_rkinds = -1
-
-          OPEN(8, FILE='pac_fconftest.out', FORM='formatted')
-
-          ! Find integer KINDs
-          list_ikinds(num_ikinds)=SELECTED_INT_KIND(1)
-          DO ik = 2, 36
-            k = SELECTED_INT_KIND(ik)
-            IF(k.LT.0) EXIT
-            IF(k.GT.list_ikinds(num_ikinds))THEN
-               num_ikinds = num_ikinds + 1
-               list_ikinds(num_ikinds) = k
-            ENDIF
-          ENDDO
-
-          DO k = 1, num_ikinds
-             WRITE(8,'(I0)', ADVANCE='NO') list_ikinds(k)
-             IF(k.NE.num_ikinds)THEN
-                WRITE(8,'(A)',ADVANCE='NO') ','
-             ELSE
-                WRITE(8,'()')
-             ENDIF
-          ENDDO
-
-          ! Find real KINDs
-          list_rkinds(num_rkinds)=SELECTED_REAL_KIND(1)
-          max_decimal_prec = 1
-
-          prec: DO ik = 2, 36
-             exp: DO jk = 1, 17000
-                k = SELECTED_REAL_KIND(ik,jk)
-                IF(k.LT.0) EXIT exp
-                IF(k.GT.list_rkinds(num_rkinds))THEN
-                   num_rkinds = num_rkinds + 1
-                   list_rkinds(num_rkinds) = k
-                ENDIF
-                max_decimal_prec = ik
-             ENDDO exp
-          ENDDO prec
-
-          DO k = 1, num_rkinds
-             WRITE(8,'(I0)', ADVANCE='NO') list_rkinds(k)
-             IF(k.NE.num_rkinds)THEN
-                WRITE(8,'(A)',ADVANCE='NO') ','
-             ELSE
-                WRITE(8,'()')
-             ENDIF
-          ENDDO
-
-         WRITE(8,'(I0)') max_decimal_prec
-         WRITE(8,'(I0)') num_ikinds
-         WRITE(8,'(I0)') num_rkinds
-      END PROGRAM FC_AVAIL_KINDS
-  "
-)
+READ_SOURCE ("PROGRAM FC_AVAIL_KINDS" "END PROGRAM FC_AVAIL_KINDS" SOURCE_CODE)
 if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
-  check_fortran_source_runs (${PROG_SRC_CODE} FC_AVAIL_KINDS_RESULT SRC_EXT f90)
+  check_fortran_source_runs (${SOURCE_CODE} FC_AVAIL_KINDS_RESULT SRC_EXT f90)
 else ()
 FORTRAN_RUN ("REAL and INTEGER KINDs"
-    "${PROG_SRC_CODE}"
+    "${SOURCE_CODE}"
     XX
     YY
     FC_AVAIL_KINDS_RESULT
@@ -260,7 +198,7 @@ foreach (KIND ${VAR})
           USE ISO_C_BINDING
           IMPLICIT NONE
           INTEGER (KIND=${KIND}) a
-          OPEN(8,FILE='pac_validIntKinds.out',FORM='formatted')
+          OPEN(8,FILE='pac_validIntKinds.${KIND}.out',FORM='formatted')
           WRITE(8,'(I0)') ${FC_SIZEOF_A}
           CLOSE(8)
        END
@@ -271,7 +209,7 @@ foreach (KIND ${VAR})
   else ()
     FORTRAN_RUN("INTEGER KIND SIZEOF" ${PROG_SRC_${KIND}} XX YY VALIDINTKINDS_RESULT_${KIND})
   endif ()
-  file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_validIntKinds.out" PROG_OUTPUT1)
+  file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_validIntKinds.${KIND}.out" PROG_OUTPUT1)
   string (REGEX REPLACE "\n" "" PROG_OUTPUT1 "${PROG_OUTPUT1}")
   set (pack_int_sizeof "${pack_int_sizeof} ${PROG_OUTPUT1},")
 endforeach ()
@@ -309,7 +247,7 @@ foreach (KIND ${VAR} )
           USE ISO_C_BINDING
           IMPLICIT NONE
           REAL (KIND=${KIND}) a
-          OPEN(8,FILE='pac_validRealKinds.out',FORM='formatted')
+          OPEN(8,FILE='pac_validRealKinds.${KIND}.out',FORM='formatted')
           WRITE(8,'(I0)') ${FC_SIZEOF_A}
           CLOSE(8)
        END
@@ -320,7 +258,7 @@ foreach (KIND ${VAR} )
   else ()
     FORTRAN_RUN ("REAL KIND SIZEOF" ${PROG_SRC2_${KIND}} XX YY VALIDREALKINDS_RESULT_${KIND})
   endif ()
-  file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_validRealKinds.out" PROG_OUTPUT1)
+  file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_validRealKinds.${KIND}.out" PROG_OUTPUT1)
   string (REGEX REPLACE "\n" "" PROG_OUTPUT1 "${PROG_OUTPUT1}")
   set (pack_real_sizeof "${pack_real_sizeof} ${PROG_OUTPUT1},")
 endforeach ()
@@ -375,7 +313,7 @@ if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
 else ()
   FORTRAN_RUN ("SIZEOF NATIVE KINDs" ${PROG_SRC3} XX YY PAC_SIZEOF_NATIVE_KINDS_RESULT)
 endif ()
-file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_sizeof_native_kinds.out" PROG_OUTPUT)
+file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_sizeof_native_kinds.out" PROG_OUTPUT3)
 # dnl The output from the above program will be:
 # dnl    -- LINE 1 --  sizeof INTEGER
 # dnl    -- LINE 2 --  kind of INTEGER
@@ -385,14 +323,14 @@ file (READ "${RUN_OUTPUT_PATH_DEFAULT}/pac_sizeof_native_kinds.out" PROG_OUTPUT)
 # dnl    -- LINE 6 --  kind of DOUBLE PRECISION
 
 # Convert the string to a list of strings by replacing the carriage return with a semicolon
-string (REGEX REPLACE "\n" ";" PROG_OUTPUT "${PROG_OUTPUT}")
+string (REGEX REPLACE "\n" ";" PROG_OUTPUT3 "${PROG_OUTPUT3}")
 
-list (GET PROG_OUTPUT 0 PAC_FORTRAN_NATIVE_INTEGER_SIZEOF)
-list (GET PROG_OUTPUT 1 PAC_FORTRAN_NATIVE_INTEGER_KIND)
-list (GET PROG_OUTPUT 2 PAC_FORTRAN_NATIVE_REAL_SIZEOF)
-list (GET PROG_OUTPUT 3 PAC_FORTRAN_NATIVE_REAL_KIND)
-list (GET PROG_OUTPUT 4 PAC_FORTRAN_NATIVE_DOUBLE_SIZEOF)
-list (GET PROG_OUTPUT 5 PAC_FORTRAN_NATIVE_DOUBLE_KIND)
+list (GET PROG_OUTPUT3 0 PAC_FORTRAN_NATIVE_INTEGER_SIZEOF)
+list (GET PROG_OUTPUT3 1 PAC_FORTRAN_NATIVE_INTEGER_KIND)
+list (GET PROG_OUTPUT3 2 PAC_FORTRAN_NATIVE_REAL_SIZEOF)
+list (GET PROG_OUTPUT3 3 PAC_FORTRAN_NATIVE_REAL_KIND)
+list (GET PROG_OUTPUT3 4 PAC_FORTRAN_NATIVE_DOUBLE_SIZEOF)
+list (GET PROG_OUTPUT3 5 PAC_FORTRAN_NATIVE_DOUBLE_KIND)
 
 if (NOT PAC_FORTRAN_NATIVE_INTEGER_SIZEOF)
    message (FATAL_ERROR "Failed to find SIZEOF NATIVE INTEGER KINDs for Fortran")
@@ -434,132 +372,13 @@ endif ()
 
 set (${HDF_PREFIX}_H5CONFIG_F_NUM_RKIND "INTEGER, PARAMETER :: num_rkinds = ${NUM_RKIND}")
 
-string (REGEX REPLACE "{" "" OUT_VAR ${PAC_FC_ALL_REAL_KINDS})
-string (REGEX REPLACE "}" "" OUT_VAR ${OUT_VAR})
-set (${HDF_PREFIX}_H5CONFIG_F_RKIND "INTEGER, DIMENSION(1:num_rkinds) :: rkind = (/${OUT_VAR}/)")
-
-string (REGEX REPLACE "{" "" OUT_VAR ${PAC_FC_ALL_REAL_KINDS_SIZEOF})
-string (REGEX REPLACE "}" "" OUT_VAR ${OUT_VAR})
-set (${HDF_PREFIX}_H5CONFIG_F_RKIND_SIZEOF "INTEGER, DIMENSION(1:num_rkinds) :: rkind_sizeof = (/${OUT_VAR}/)")
-
-ENABLE_LANGUAGE (C)
-
-if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
-  include (CheckCSourceRuns)
-else ()
-#-----------------------------------------------------------------------------
-# The provided CMake C macros don't provide a general compile/run function
-# so this one is used.
-#-----------------------------------------------------------------------------
-macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR)
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-      message (VERBOSE "Detecting C ${FUNCTION_NAME}")
-    endif ()
-    if (HDF5_REQUIRED_LIBRARIES)
-      set (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES
-          "-DLINK_LIBRARIES:STRING=${HDF5_REQUIRED_LIBRARIES}")
-    else ()
-      set (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES)
-    endif ()
-    file (WRITE
-        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler1.c
-        ${SOURCE_CODE}
-    )
-    TRY_RUN (RUN_RESULT_VAR COMPILE_RESULT_VAR
-        ${CMAKE_BINARY_DIR}
-        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler1.c
-        CMAKE_FLAGS "${CHECK_FUNCTION_EXISTS_ADD_LIBRARIES}"
-        RUN_OUTPUT_VARIABLE OUTPUT_VAR
-    )
-
-    set (${RETURN_VAR} ${OUTPUT_VAR})
-
-    #if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-    #  message (TRACE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
-    #  message (TRACE "Test COMPILE_RESULT_VAR ${COMPILE_RESULT_VAR} ")
-    #  message (TRACE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
-    #  message (TRACE "Test RUN_RESULT_VAR ${RUN_RESULT_VAR} ")
-    #  message (TRACE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
-    #endif ()
-
-    if (${COMPILE_RESULT_VAR})
-      if (${RUN_RESULT_VAR} MATCHES 1)
-        set (${RUN_RESULT_VAR} 1 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Testing C ${FUNCTION_NAME} - OK")
-        endif ()
-        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-            "Determining if the C ${FUNCTION_NAME} exists passed with the following output:\n"
-            "${OUTPUT_VAR}\n\n"
-        )
-      else ()
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Testing C ${FUNCTION_NAME} - Fail")
-        endif ()
-        set (${RUN_RESULT_VAR} 0 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
-        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-            "Determining if the C ${FUNCTION_NAME} exists failed with the following output:\n"
-            "${OUTPUT_VAR}\n\n")
-      endif ()
-    else ()
-        message (FATAL_ERROR "Compilation of C ${FUNCTION_NAME} - Failed")
-    endif ()
-endmacro ()
-endif ()
-
-set (PROG_SRC
-    "
-#include <float.h>
-#include <stdio.h>
-#define CHECK_FLOAT128 ${${HDF_PREFIX}_SIZEOF___FLOAT128}
-#if CHECK_FLOAT128!=0
-# if ${${HDF_PREFIX}_HAVE_QUADMATH_H}!=0
-#include <quadmath.h>
-# endif
-# ifdef FLT128_DIG
-#define C_FLT128_DIG FLT128_DIG
-# else
-#define C_FLT128_DIG 0
-# endif
-#else
-#define C_FLT128_DIG 0
-#endif
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#define C_LDBL_DIG DECIMAL_DIG
-#else
-#define C_LDBL_DIG LDBL_DIG
-#endif
-   int main() {
-       printf(\"%d\\\\n%d\\\\n\", C_LDBL_DIG, C_FLT128_DIG)\\\;
-       return 1\\\;
-   }
-     "
-)
-
-if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
-  check_c_source_runs (${PROG_SRC} PROG_OUTPUT)
-else ()
-  C_RUN ("maximum decimal precision for C" ${PROG_SRC} PROG_OUTPUT)
-endif ()
-
-# dnl The output from the above program will be:
-# dnl    -- LINE 1 --  long double decimal precision
-# dnl    -- LINE 2 --  __float128 decimal precision
-
-# Convert the string to a list of strings by replacing the carriage return with a semicolon
-string (REGEX REPLACE "\n" ";" PROG_OUTPUT "${PROG_OUTPUT}")
-
-list (GET PROG_OUTPUT 0 LDBL_DIG)
-list (GET PROG_OUTPUT 1 FLT128_DIG)
-
-if (${HDF_PREFIX}_SIZEOF___FLOAT128 EQUAL 0 OR FLT128_DIG EQUAL 0)
-  set (${HDF_PREFIX}_HAVE_FLOAT128 0)
-  set (${HDF_PREFIX}_SIZEOF___FLOAT128 0)
-  set (${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION ${LDBL_DIG})
-else ()
-  set(${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION ${FLT128_DIG})
-endif ()
+string (REGEX REPLACE "{" "" OUT_VAR1 ${PAC_FC_ALL_REAL_KINDS})
+string (REGEX REPLACE "}" "" OUT_VAR1 ${OUT_VAR1})
+set (${HDF_PREFIX}_H5CONFIG_F_RKIND "INTEGER, DIMENSION(1:num_rkinds) :: rkind = (/${OUT_VAR1}/)")
 
+string (REGEX REPLACE "{" "" OUT_VAR2 ${PAC_FC_ALL_REAL_KINDS_SIZEOF})
+string (REGEX REPLACE "}" "" OUT_VAR2 ${OUT_VAR2})
+set (${HDF_PREFIX}_H5CONFIG_F_RKIND_SIZEOF "INTEGER, DIMENSION(1:num_rkinds) :: rkind_sizeof = (/${OUT_VAR2}/)")
 
 # Setting definition if there is a 16 byte fortran integer
 string (FIND ${PAC_FC_ALL_INTEGER_KINDS_SIZEOF} "16" pos)
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index 757692c..8bcfb14 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -71,10 +71,6 @@ endif ()
 # HDF5 library compile options
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# CDash is configured to only allow 3000 warnings, so
-# break into groups (from the config/gnu-flags file)
-#-----------------------------------------------------------------------------
 if (NOT MSVC AND NOT MINGW)
   if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
     list (APPEND HDF5_CMAKE_CXX_FLAGS "-erroff=%none -DBSD_COMP")
@@ -147,7 +143,7 @@ if (NOT MSVC AND NOT MINGW)
       ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
     endif ()
 
-    # Append more extra warning flags that only gcc 4.8+ know about
+    # Append more extra warning flags that only gcc 4.8+ knows about
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
       ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8")
       if (HDF5_ENABLE_DEV_WARNINGS)
@@ -157,14 +153,14 @@ if (NOT MSVC AND NOT MINGW)
       endif ()
     endif ()
 
-    # Append more extra warning flags that only gcc 4.9+ know about
+    # Append more extra warning flags that only gcc 4.9+ knows about
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
       # autotools always add the C flags with the CXX flags
       ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.9")
       ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.9")
     endif ()
 
-    # Append more extra warning flags that only gcc 5.1+ know about
+    # Append more extra warning flags that only gcc 5.1+ knows about
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
       # autotools always add the C flags with the CXX flags
       ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-5")
@@ -175,13 +171,13 @@ if (NOT MSVC AND NOT MINGW)
       endif ()
     endif ()
 
-    # Append more extra warning flags that only gcc 6.x+ know about
+    # Append more extra warning flags that only gcc 6.x+ knows about
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
       # autotools always add the C flags with the CXX flags
       ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
     endif ()
 
-    # Append more extra warning flags that only gcc 7.x+ know about
+    # Append more extra warning flags that only gcc 7.x+ knows about
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
       # autotools always add the C flags with the CXX flags
       ADD_H5_FLAGS (H5_CXxFLAGS2 "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
@@ -193,7 +189,7 @@ if (NOT MSVC AND NOT MINGW)
       endif ()
     endif ()
 
-    # Append more extra warning flags that only gcc 8.x+ know about
+    # Append more extra warning flags that only gcc 8.x+ knows about
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
       # autotools always add the C flags with the CXX flags
       ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
@@ -211,7 +207,7 @@ if (NOT MSVC AND NOT MINGW)
       endif ()
     endif ()
 
-    # Append more extra warning flags that only gcc 9.x+ know about
+    # Append more extra warning flags that only gcc 9.x+ knows about
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
       # autotools always add the C flags with the CXX flags
       ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9")
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index bb6ad78..0775f59 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -81,10 +81,6 @@ endif ()
 # HDF5 library compile options
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# CDash is configured to only allow 3000 warnings, so
-# break into groups (from the config/gnu-flags file)
-#-----------------------------------------------------------------------------
 if (NOT MSVC AND NOT MINGW)
   #-----------------------------------------------------------------------------
   # Option to allow the user to interpret certain warnings as errors
@@ -178,7 +174,7 @@ if (NOT MSVC AND NOT MINGW)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
     endif ()
 
-    # Append more extra warning flags that only gcc 4.8+ know about
+    # Append more extra warning flags that only gcc 4.8+ knows about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8")
       if (HDF5_ENABLE_DEV_WARNINGS)
@@ -188,12 +184,12 @@ if (NOT MSVC AND NOT MINGW)
       endif ()
     endif ()
 
-    # Append more extra warning flags that only gcc 4.9+ know about
+    # Append more extra warning flags that only gcc 4.9+ knows about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.9")
     endif ()
 
-    # Append more extra warning flags that only gcc 5.x+ know about
+    # Append more extra warning flags that only gcc 5.x+ knows about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/5")
       if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
@@ -203,12 +199,12 @@ if (NOT MSVC AND NOT MINGW)
       endif ()
     endif ()
 
-    # Append more extra warning flags that only gcc 6.x+ know about
+    # Append more extra warning flags that only gcc 6.x+ knows about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
     endif ()
 
-    # Append more extra warning flags that only gcc 7.x+ know about
+    # Append more extra warning flags that only gcc 7.x+ knows about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
       if (HDF5_ENABLE_DEV_WARNINGS)
@@ -218,7 +214,7 @@ if (NOT MSVC AND NOT MINGW)
       endif ()
     endif ()
 
-    # Append more extra warning flags that only gcc 8.x+ know about
+    # Append more extra warning flags that only gcc 8.x+ knows about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
       if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
@@ -231,17 +227,17 @@ if (NOT MSVC AND NOT MINGW)
       endif ()
     endif ()
 
-    # Append more extra warning flags that only gcc 9.x+ know about
+    # Append more extra warning flags that only gcc 9.x+ knows about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.0)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9")
     endif ()
 
-    # Append more extra warning flags that only gcc 9.3+ know about
+    # Append more extra warning flags that only gcc 9.3+ knows about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.3)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
     endif ()
 
-    # Append more extra warning flags that only gcc 10.x+ know about
+    # Append more extra warning flags that only gcc 10.x+ knows about
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
       if (HDF5_ENABLE_DEV_WARNINGS)
         ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake
index 8b631ad..18ab621 100644
--- a/config/cmake/HDFFortranCompilerFlags.cmake
+++ b/config/cmake/HDFFortranCompilerFlags.cmake
@@ -80,37 +80,37 @@ if (NOT MSVC AND NOT MINGW)
 
   if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
 
-    # Append more extra warning flags that only gcc 4.8+ know about
+    # Append more extra warning flags that only gcc 4.8+ knows about
     if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.8)
       ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.8")
     endif ()
 
-    # Append more extra warning flags that only gcc 4.9+ know about
+    # Append more extra warning flags that only gcc 4.9+ knows about
     #if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.9)
     #  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.9")
     #endif ()
 
-    # Append more extra warning flags that only gcc 5.x+ know about
+    # Append more extra warning flags that only gcc 5.x+ knows about
     if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5.0)
       ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-5")
     endif ()
 
-    # Append more extra warning flags that only gcc 6.x+ know about
+    # Append more extra warning flags that only gcc 6.x+ knows about
     if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0)
       ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-6")
     endif ()
 
-    # Append more extra warning flags that only gcc 7.x+ know about
+    # Append more extra warning flags that only gcc 7.x+ knows about
     #if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0)
     #  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-7")
     #endif ()
 
-    # Append more extra warning flags that only gcc 8.x+ know about
+    # Append more extra warning flags that only gcc 8.x+ knows about
     if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8.0)
       ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-8")
     endif ()
 
-    # Append more extra warning flags that only gcc 9.x+ know about
+    # Append more extra warning flags that only gcc 9.x+ knows about
     #if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 9.0)
     #  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-9")
     #endif ()
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index d849086..e59a829 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -74,7 +74,7 @@ add_executable (H5match_types
 target_include_directories (H5match_types PRIVATE "${HDF5_SRC_BINARY_DIR};${HDF5_SRC_DIR};${HDF5_F90_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
 
 add_custom_command (TARGET H5match_types POST_BUILD
-    BYPRODUCTS H5f90i_gen.h H5fortran_types.F90
+    BYPRODUCTS ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/H5fortran_types.F90
     COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5match_types>
     WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
     DEPENDS H5match_types
@@ -82,7 +82,7 @@ add_custom_command (TARGET H5match_types POST_BUILD
 
 if (NOT ONLY_SHARED_LIBS)
   add_custom_command (TARGET H5match_types POST_BUILD
-      BYPRODUCTS H5f90i_gen.h H5fortran_types.F90
+      BYPRODUCTS ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90
       COMMAND    ${CMAKE_COMMAND}
       ARGS       -E copy_if_different ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
       COMMAND    ${CMAKE_COMMAND}
@@ -95,7 +95,7 @@ if (NOT ONLY_SHARED_LIBS)
 endif ()
 if (BUILD_SHARED_LIBS)
   add_custom_command (TARGET H5match_types POST_BUILD
-      BYPRODUCTS H5f90i_gen.h H5fortran_types.F90
+      BYPRODUCTS ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90
       COMMAND    ${CMAKE_COMMAND}
       ARGS       -E copy_if_different ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
       COMMAND    ${CMAKE_COMMAND}
@@ -235,7 +235,7 @@ add_custom_command (TARGET H5_buildiface POST_BUILD
 )
 if (NOT ONLY_SHARED_LIBS)
   add_custom_command (TARGET H5_buildiface POST_BUILD
-      BYPRODUCTS H5_gen.F90
+      BYPRODUCTS ${HDF5_F90_BINARY_DIR}/static/H5_gen.F90
       COMMAND    ${CMAKE_COMMAND}
       ARGS       -E copy_if_different ${HDF5_F90_BINARY_DIR}/H5_gen.F90 ${HDF5_F90_BINARY_DIR}/static/H5_gen.F90
       WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/static
@@ -250,7 +250,7 @@ endif ()
 
 if (BUILD_SHARED_LIBS)
   add_custom_command (TARGET H5_buildiface POST_BUILD
-      BYPRODUCTS H5_gen.F90
+      BYPRODUCTS ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90
       COMMAND    ${CMAKE_COMMAND}
       ARGS       -E copy_if_different ${HDF5_F90_BINARY_DIR}/H5_gen.F90 ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90
       WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/shared
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 147746c..1e879e7 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -92,7 +92,7 @@ endif ()
 
 if (NOT BUILD_SHARED_LIBS)
   add_custom_command (TARGET H5_test_buildiface POST_BUILD
-      BYPRODUCTS tf_gen.F90
+      BYPRODUCTS ${HDF5_FORTRAN_TESTS_BINARY_DIR}/static/tf_gen.F90
       COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5_test_buildiface>
       WORKING_DIRECTORY ${HDF5_FORTRAN_TESTS_BINARY_DIR}/static
       DEPENDS H5_test_buildiface
@@ -104,7 +104,7 @@ if (NOT BUILD_SHARED_LIBS)
   set_source_files_properties (${HDF5_FORTRAN_TESTS_BINARY_DIR}/static/tf_gen.F90 PROPERTIES GENERATED TRUE)
 else ()
   add_custom_command (TARGET H5_test_buildiface POST_BUILD
-      BYPRODUCTS tf_gen.F90
+      BYPRODUCTS ${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared/tf_gen.F90
       COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5_test_buildiface>
       WORKING_DIRECTORY ${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared
       DEPENDS H5_test_buildiface
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 6c97886..973299f 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -115,7 +115,7 @@ set (HDF5_HL_F90_F_BASE_SOURCES
 
 if (NOT ONLY_SHARED_LIBS)
   add_custom_command (TARGET H5HL_buildiface POST_BUILD
-      BYPRODUCTS $H5LTff_gen.F90 H5TBff_gen.F90
+      BYPRODUCTS ${HDF5_HL_F90_BINARY_DIR}/static/H5LTff_gen.F90 ${HDF5_HL_F90_BINARY_DIR}/static/H5TBff_gen.F90
       COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5HL_buildiface>
       WORKING_DIRECTORY ${HDF5_HL_F90_BINARY_DIR}/static
       DEPENDS ${HDF5_HL_F90_F_BASE_SOURCES}
@@ -132,7 +132,7 @@ if (NOT ONLY_SHARED_LIBS)
 endif ()
 if (BUILD_SHARED_LIBS)
   add_custom_command (TARGET H5HL_buildiface POST_BUILD
-      BYPRODUCTS H5LTff_gen.F90 H5TBff_gen.F90
+      BYPRODUCTS ${HDF5_HL_F90_BINARY_DIR}/shared/H5LTff_gen.F90 ${HDF5_HL_F90_BINARY_DIR}/shared/H5TBff_gen.F90
       COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:H5HL_buildiface>
       WORKING_DIRECTORY ${HDF5_HL_F90_BINARY_DIR}/shared
       DEPENDS ${HDF5_HL_F90_F_BASE_SOURCES}
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index 5e2e7ea..af0a4b8 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -10726,7 +10726,18 @@ public class H5 implements java.io.Serializable {
      * @exception IllegalArgumentException
      *                - an input array is invalid.
      **/
-    public synchronized static native long H5Ropen_object(byte[] ref_ptr, long rapl_id, long oapl_id)
+    public static long H5Ropen_object(byte[] ref_ptr, long rapl_id, long oapl_id)
+            throws HDF5LibraryException, NullPointerException, IllegalArgumentException {
+        long id = _H5Ropen_object(ref_ptr, rapl_id, oapl_id);
+        if (id > 0) {
+            log.trace("OPEN_IDS: H5Ropen_object add {}", id);
+            OPEN_IDS.add(id);
+            log.trace("OPEN_IDS: {}", OPEN_IDS.size());
+        }
+        return id;
+    }
+
+    private synchronized static native long _H5Ropen_object(byte[] ref_ptr, long rapl_id, long oapl_id)
             throws HDF5LibraryException, NullPointerException, IllegalArgumentException;
 
     /**
@@ -10754,7 +10765,18 @@ public class H5 implements java.io.Serializable {
      * @exception IllegalArgumentException
      *                - an input array is invalid.
      **/
-    public synchronized static native long H5Ropen_region(byte[] ref_ptr, long rapl_id, long oapl_id)
+    public static long H5Ropen_region(byte[] ref_ptr, long rapl_id, long oapl_id)
+            throws HDF5LibraryException, NullPointerException, IllegalArgumentException {
+        long id = _H5Ropen_region(ref_ptr, rapl_id, oapl_id);
+        if (id > 0) {
+            log.trace("OPEN_IDS: H5Ropen_region add {}", id);
+            OPEN_IDS.add(id);
+            log.trace("OPEN_IDS: {}", OPEN_IDS.size());
+        }
+        return id;
+    }
+
+    private synchronized static native long _H5Ropen_region(byte[] ref_ptr, long rapl_id, long oapl_id)
             throws HDF5LibraryException, NullPointerException, IllegalArgumentException;
 
     /**
@@ -10782,7 +10804,18 @@ public class H5 implements java.io.Serializable {
      * @exception IllegalArgumentException
      *                - an input array is invalid.
      **/
-    public synchronized static native long H5Ropen_attr(byte[] ref_ptr, long rapl_id, long aapl_id)
+    public static long H5Ropen_attr(byte[] ref_ptr, long rapl_id, long aapl_id)
+            throws HDF5LibraryException, NullPointerException, IllegalArgumentException {
+        long id = _H5Ropen_attr(ref_ptr, rapl_id, aapl_id);
+        if (id > 0) {
+            log.trace("OPEN_IDS: H5Ropen_attr add {}", id);
+            OPEN_IDS.add(id);
+            log.trace("OPEN_IDS: {}", OPEN_IDS.size());
+        }
+        return id;
+    }
+
+    private synchronized static native long _H5Ropen_attr(byte[] ref_ptr, long rapl_id, long aapl_id)
             throws HDF5LibraryException, NullPointerException, IllegalArgumentException;
 
     // Get type //
diff --git a/java/src/jni/h5rImp.c b/java/src/jni/h5rImp.c
index c08f5de..9fe0701 100644
--- a/java/src/jni/h5rImp.c
+++ b/java/src/jni/h5rImp.c
@@ -336,7 +336,7 @@ done:
  * Signature: ([BJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ropen_1object(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id)
+Java_hdf_hdf5lib_H5__1H5Ropen_1object(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id)
 {
     jboolean isCopy;
     jbyte *  refBuf = NULL;
@@ -371,7 +371,7 @@ done:
  * Signature: ([BJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ropen_1region(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id)
+Java_hdf_hdf5lib_H5__1H5Ropen_1region(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id)
 {
     jboolean isCopy;
     jbyte *  refBuf = NULL;
@@ -406,7 +406,7 @@ done:
  * Signature: ([BJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ropen_1attr(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong aapl_id)
+Java_hdf_hdf5lib_H5__1H5Ropen_1attr(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong aapl_id)
 {
     jboolean isCopy;
     jbyte *  refBuf = NULL;
diff --git a/java/src/jni/h5rImp.h b/java/src/jni/h5rImp.h
index cdfdd8e..ffd7737 100644
--- a/java/src/jni/h5rImp.h
+++ b/java/src/jni/h5rImp.h
@@ -78,21 +78,21 @@ JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcopy(JNIEnv *, jclass, jbyte
  * Method:    H5Ropen_object
  * Signature: ([BJJ)J
  */
-JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Ropen_1object(JNIEnv *, jclass, jbyteArray, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Ropen_1object(JNIEnv *, jclass, jbyteArray, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ropen_region
  * Signature: ([BJJ)J
  */
-JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Ropen_1region(JNIEnv *, jclass, jbyteArray, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Ropen_1region(JNIEnv *, jclass, jbyteArray, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ropen_attr
  * Signature: ([BJJ)J
  */
-JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Ropen_1attr(JNIEnv *, jclass, jbyteArray, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Ropen_1attr(JNIEnv *, jclass, jbyteArray, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
diff --git a/java/test/TestH5Rref.java b/java/test/TestH5Rref.java
index cbdabdd..5733aae 100644
--- a/java/test/TestH5Rref.java
+++ b/java/test/TestH5Rref.java
@@ -134,7 +134,7 @@ public class TestH5Rref {
             try {H5.H5Tclose(f_type);} catch (Exception ex) {}
         }
         try {
-            ndims = H5.H5Sget_simple_extent_ndims(H5dsid);
+            ndims = (int)H5.H5Sget_simple_extent_npoints(H5dsid);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -209,7 +209,7 @@ public class TestH5Rref {
             try {H5.H5Tclose(f_type);} catch (Exception ex) {}
         }
         try {
-            ndims = H5.H5Sget_simple_extent_ndims(H5dsid);
+            ndims = (int)H5.H5Sget_simple_extent_npoints(H5dsid);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -286,7 +286,7 @@ public class TestH5Rref {
           try {H5.H5Tclose(f_type);} catch (Exception ex) {}
       }
       try {
-          ndims = H5.H5Sget_simple_extent_ndims(H5dsid);
+          ndims = (int)H5.H5Sget_simple_extent_npoints(H5dsid);
       }
       catch (Throwable err) {
           err.printStackTrace();
@@ -305,80 +305,81 @@ public class TestH5Rref {
       }
       for (int i = 0; i < ndims; i++) {
           try {
-              ret_val = H5.H5Rget_type(refbuf[i]);
+              try {
+                  ret_val = H5.H5Rget_type(refbuf[i]);
+              }
+              catch (Throwable err) {
+                  err.printStackTrace();
+                  fail("testH5Rget_region_dataset: H5Rget_type["+i+"]: " + err);
+              }
               assertTrue("testH5Rget_region_dataset: H5Rget_type["+i+"]="+ret_val, ret_val == ref_type);
               try {
                   loc_id = H5.H5Ropen_object(refbuf[i], HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
                   assertTrue(loc_id >= 0);
-                  boolean regionzero = byteArrayCheck(refbuf[i]);
-                  if (i > 1)
-                      assertTrue(regionzero);
-                  else {
+                  try {
+                      loc_sid = H5.H5Ropen_region(refbuf[i], HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
+                      assertTrue(loc_sid >= 0);
+                      int region_type = -1;
                       try {
-                          loc_sid = H5.H5Ropen_region(refbuf[i], HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
-                          assertTrue(loc_sid >= 0);
-                          int region_type = -1;
-                          try {
-                              int reg_ndims = H5.H5Sget_simple_extent_ndims(loc_sid);
-                              region_type = H5.H5Sget_select_type(loc_sid);
-                              if (i == 1)
-                                  assertTrue(region_type == HDF5Constants.H5S_SEL_POINTS);
-                              else
-                                  assertTrue(region_type == HDF5Constants.H5S_SEL_HYPERSLABS);
-                              if (region_type == HDF5Constants.H5S_SEL_POINTS) {
-                                  long reg_npoints = H5.H5Sget_select_elem_npoints(loc_sid);
-                                  // Coordinates for get point selection
-                                  long getcoord[] = new long[reg_ndims * (int)reg_npoints];
-                                  // Known coordinates for point selection
-                                  long coord[][] = {{6,9},{2,2},{8,4},{1,6},{2,8},{3,2},
-                                                   {0,4},{9,0},{7,1},{3,3}};
-                                  try {
-                                      H5.H5Sget_select_elem_pointlist(loc_sid, 0, reg_npoints, getcoord);
-                                      assertTrue("H5.H5Sget_select_elem_pointlist", coord[0][0] == getcoord[0]);
-                                      assertTrue("H5.H5Sget_select_elem_pointlist", coord[0][1] == getcoord[1]);
-                                      assertTrue("H5.H5Sget_select_elem_pointlist", coord[1][0] == getcoord[2]);
-                                      assertTrue("H5.H5Sget_select_elem_pointlist", coord[1][1] == getcoord[3]);
-                                      assertTrue("H5.H5Sget_select_elem_pointlist", coord[2][0] == getcoord[4]);
-                                      assertTrue("H5.H5Sget_select_elem_pointlist", coord[2][1] == getcoord[5]);
-                                  }
-                                  catch (Throwable err3) {
-                                      err3.printStackTrace();
-                                      fail("H5.H5Sget_select_elem_pointlist: " + err3);
-                                  }
+                          int reg_ndims = H5.H5Sget_simple_extent_ndims(loc_sid);
+                          region_type = H5.H5Sget_select_type(loc_sid);
+                          if (i == 1)
+                              assertTrue(region_type == HDF5Constants.H5S_SEL_POINTS);
+                          else
+                              assertTrue(region_type == HDF5Constants.H5S_SEL_HYPERSLABS);
+                          if (region_type == HDF5Constants.H5S_SEL_POINTS) {
+                              long reg_npoints = H5.H5Sget_select_elem_npoints(loc_sid);
+                              // Coordinates for get point selection
+                              long getcoord[] = new long[reg_ndims * (int)reg_npoints];
+                              // Known coordinates for point selection
+                              long coord[][] = {{6,9},{2,2},{8,4},{1,6},{2,8},{3,2},
+                                               {0,4},{9,0},{7,1},{3,3}};
+                              try {
+                                  H5.H5Sget_select_elem_pointlist(loc_sid, 0, reg_npoints, getcoord);
+                                  assertTrue("H5.H5Sget_select_elem_pointlist", coord[0][0] == getcoord[0]);
+                                  assertTrue("H5.H5Sget_select_elem_pointlist", coord[0][1] == getcoord[1]);
+                                  assertTrue("H5.H5Sget_select_elem_pointlist", coord[1][0] == getcoord[2]);
+                                  assertTrue("H5.H5Sget_select_elem_pointlist", coord[1][1] == getcoord[3]);
+                                  assertTrue("H5.H5Sget_select_elem_pointlist", coord[2][0] == getcoord[4]);
+                                  assertTrue("H5.H5Sget_select_elem_pointlist", coord[2][1] == getcoord[5]);
                               }
-                              else if (region_type == HDF5Constants.H5S_SEL_HYPERSLABS) {
-                                  long reg_nblocks = H5.H5Sget_select_hyper_nblocks(loc_sid);
-                                  assertTrue("H5Sget_select_hyper_nblocks", reg_nblocks == 1);
-                                  // Coordinates for get block selection
-                                  long getblocks[] = new long[reg_ndims * (int)reg_nblocks * 2];
-                                  long start[] = {2,2};
-                                  long block[] = {8,8};
-                                  try {
-                                      H5.H5Sget_select_hyper_blocklist(loc_sid, 0, reg_nblocks, getblocks);
-                                      assertTrue("H5.H5Sget_select_hyper_blocklist", start[0] == getblocks[0]);
-                                      assertTrue("H5.H5Sget_select_hyper_blocklist", start[1] == getblocks[1]);
-                                      assertTrue("H5.H5Sget_select_hyper_blocklist", (block[0]-1) == getblocks[2]);
-                                      assertTrue("H5.H5Sget_select_hyper_blocklist", (block[1]-1) == getblocks[3]);
-                                  }
-                                  catch (Throwable err3) {
-                                      err3.printStackTrace();
-                                      fail("H5.H5Sget_select_hyper_blocklist: " + err3);
-                                  }
+                              catch (Throwable err3) {
+                                  err3.printStackTrace();
+                                  fail("H5.H5Sget_select_elem_pointlist: " + err3);
                               }
                           }
-                          catch (Throwable err2) {
-                              err2.printStackTrace();
-                              fail("testH5Rget_region_dataset: H5Sget_select_type: " + err2);
+                          else if (region_type == HDF5Constants.H5S_SEL_HYPERSLABS) {
+                              long reg_nblocks = H5.H5Sget_select_hyper_nblocks(loc_sid);
+                              assertTrue("H5Sget_select_hyper_nblocks", reg_nblocks == 1);
+                              // Coordinates for get block selection
+                              long getblocks[] = new long[reg_ndims * (int)reg_nblocks * 2];
+                              long start[] = {2,2};
+                              long block[] = {8,8};
+                              try {
+                                  H5.H5Sget_select_hyper_blocklist(loc_sid, 0, reg_nblocks, getblocks);
+                                  assertTrue("H5.H5Sget_select_hyper_blocklist", start[0] == getblocks[0]);
+                                  assertTrue("H5.H5Sget_select_hyper_blocklist", start[1] == getblocks[1]);
+                                  assertTrue("H5.H5Sget_select_hyper_blocklist", (block[0]-1) == getblocks[2]);
+                                  assertTrue("H5.H5Sget_select_hyper_blocklist", (block[1]-1) == getblocks[3]);
+                              }
+                              catch (Throwable err3) {
+                                  err3.printStackTrace();
+                                  fail("H5.H5Sget_select_hyper_blocklist: " + err3);
+                              }
                           }
                       }
-                      catch (Throwable err1) {
-                          err1.printStackTrace();
-                          fail("testH5Rget_region_dataset: " + err1);
-                      }
-                      finally {
-                          try {H5.H5Sclose(loc_sid);} catch (Exception ex) {}
+                      catch (Throwable err2) {
+                          err2.printStackTrace();
+                          assertTrue("testH5Rget_region_dataset: H5Sget_select_type: " + err2, i > 1);
                       }
                   }
+                  catch (Throwable err1) {
+                      err1.printStackTrace();
+                      fail("testH5Rget_region_dataset: " + err1);
+                  }
+                  finally {
+                      try {H5.H5Sclose(loc_sid);} catch (Exception ex) {}
+                  }
               }
               catch (Throwable err0) {
                   err0.printStackTrace();
@@ -432,7 +433,7 @@ public class TestH5Rref {
           try {H5.H5Tclose(f_type);} catch (Exception ex) {}
       }
       try {
-          ndims = H5.H5Sget_simple_extent_ndims(H5dsid);
+          ndims = (int)H5.H5Sget_simple_extent_npoints(H5dsid);
       }
       catch (Throwable err) {
           err.printStackTrace();
@@ -473,7 +474,8 @@ public class TestH5Rref {
               }
               catch (Throwable err0) {
                   err0.printStackTrace();
-                  fail("testH5Rget_region_attribute: " + err0);
+                  // second attribute is null
+                  assertTrue("testH5Rget_region_attribute: " + err0, i == 1);
               }
               finally {
                   try {H5.H5Aclose(loc_id);} catch (Exception ex) {}
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 979b12d..e04e8cd 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -774,6 +774,22 @@ Bug Fixes since HDF5-1.12.0 release
 
     Configuration
     -------------
+    - Refactor CMake configure for Fortran
+
+      The Fortran configure tests for KINDs reused a single output file that was
+      read to form the Integer and Real Kinds defines. However, if config was run
+      more then once, the CMake completed variable prevented the tests from executing
+      again and the last value saved in the file was used to create the define.
+      Creating separate files for each KIND solved the issue.
+
+      In addition the test for H5_PAC_C_MAX_REAL_PRECISION was not pulling in
+      defines for proper operation and did not define H5_PAC_C_MAX_REAL_PRECISION
+      correctly for a zero value. This was fixed by supplying the required defines.
+      In addition it was moved from the Fortran specific HDF5UseFortran.camke file
+      to the C centric ConfigureChecks.cmake file.
+
+      (2021/06/03)
+
     - Remove arbitrary warning flag groups from CMake builds
 
       The arbitrary groups were created to reduce the quantity of warnings being
diff --git a/tools/test/h5copy/CMakeTests.cmake b/tools/test/h5copy/CMakeTests.cmake
index 73fbda6..e9b36fe 100644
--- a/tools/test/h5copy/CMakeTests.cmake
+++ b/tools/test/h5copy/CMakeTests.cmake
@@ -76,13 +76,13 @@
     endif ()
 
     # resultcode=2 will cause the test to skip the diff test
-    if (NOT ${resultcode} EQUAL 2)
+    if (NOT "${resultcode}" STREQUAL "2")
       add_test (
           NAME H5COPY_F-${testname}-DIFF
           COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
       set_tests_properties (H5COPY_F-${testname}-DIFF PROPERTIES DEPENDS H5COPY_F-${testname})
-      if (${resultcode} EQUAL 1)
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5COPY_F-${testname}-DIFF PROPERTIES WILL_FAIL "true")
       endif ()
     endif ()
@@ -110,13 +110,13 @@
     endif ()
 
     # resultcode=2 will cause the test to skip the diff test
-    if (NOT ${resultcode} EQUAL 2)
+    if (NOT "${resultcode}" STREQUAL "2")
       add_test (
           NAME H5COPY-${testname}-DIFF
           COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
       set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES DEPENDS H5COPY-${testname})
-      if (${resultcode} EQUAL 1)
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES WILL_FAIL "true")
       endif ()
     endif ()
@@ -159,13 +159,13 @@
     )
     set_tests_properties (H5COPY-${testname} PROPERTIES DEPENDS H5COPY-${testname}-prefill)
     # resultcode=2 will cause the test to skip the diff test
-    if (NOT ${resultcode} EQUAL 2)
+    if (NOT "${resultcode}" STREQUAL "2")
       add_test (
           NAME H5COPY-${testname}-DIFF
           COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
       set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES DEPENDS H5COPY-${testname})
-      if (${resultcode} EQUAL 1)
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES WILL_FAIL "true")
       endif ()
     endif ()
@@ -198,13 +198,13 @@
     )
     set_tests_properties (H5COPY_SAME-${testname} PROPERTIES DEPENDS H5COPY_SAME-${testname}-prefill)
     # resultcode=2 will cause the test to skip the diff test
-    if (NOT ${resultcode} EQUAL 2)
+    if (NOT "${resultcode}" STREQUAL "2")
       add_test (
           NAME H5COPY_SAME-${testname}-DIFF
           COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> -v ./testfiles/${testname}.out.h5 ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
       set_tests_properties (H5COPY_SAME-${testname}-DIFF PROPERTIES DEPENDS H5COPY_SAME-${testname})
-      if (${resultcode} EQUAL 1)
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5COPY_SAME-${testname}-DIFF PROPERTIES WILL_FAIL "true")
       endif ()
     endif ()
@@ -218,7 +218,7 @@
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5COPY-CMP-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN})
-      if (${resultcode} EQUAL 1)
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5COPY-CMP-${testname} PROPERTIES WILL_FAIL "true")
       endif ()
       if (last_test)
@@ -255,7 +255,7 @@
           NAME H5COPY_UD-${testname}-clear-objects
           COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}.out.h5
       )
-      if (${resultcode} EQUAL 2)
+      if ("${resultcode}" STREQUAL "2")
         add_test (
             NAME H5COPY_UD-${testname}
             COMMAND "${CMAKE_COMMAND}"
@@ -318,7 +318,7 @@
           NAME H5COPY_UD_ERR-${testname}-clearall-objects
           COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}_ERR.out.h5
       )
-      if (${resultcode} EQUAL 2)
+      if ("${resultcode}" STREQUAL "2")
         add_test (
             NAME H5COPY_UD_ERR-${testname}
             COMMAND "${CMAKE_COMMAND}"
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 6b1022d..11c882f 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -446,7 +446,7 @@
 
   macro (ADD_H5_UD_TEST testname resultcode resultfile)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      if (${resultcode} EQUAL 2)
+      if ("${resultcode}" STREQUAL "2")
         add_test (
             NAME H5DIFF_UD-${testname}
             COMMAND "${CMAKE_COMMAND}"
diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake
index 98435ce..cd2f764 100644
--- a/tools/test/h5ls/CMakeTests.cmake
+++ b/tools/test/h5ls/CMakeTests.cmake
@@ -139,7 +139,7 @@
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5LS-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls${tgt_file_ext}> ${ARGN})
       set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      if (${resultcode} EQUAL 1)
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
     else ()
@@ -164,7 +164,7 @@
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5LS-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls${tgt_file_ext}> ${ARGN})
       set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      if (${resultcode} EQUAL 1)
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
     else ()
diff --git a/tools/test/h5ls/CMakeTestsVDS.cmake b/tools/test/h5ls/CMakeTestsVDS.cmake
index e8b11bf..e93e7e7 100644
--- a/tools/test/h5ls/CMakeTestsVDS.cmake
+++ b/tools/test/h5ls/CMakeTestsVDS.cmake
@@ -85,7 +85,7 @@
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5LS-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls${tgt_file_ext}> ${ARGN})
       set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
-      if (${resultcode} EQUAL 1)
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
     else ()
@@ -112,7 +112,7 @@
           ENVIRONMENT "HDF5_VDS_PREFIX=\${ORIGIN}"
           WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
       )
-      if (${resultcode} EQUAL 1)
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5LS_PREFIX-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
     else ()