Update CMake code to 3.18 minimum version (#2080)

* Update CMake code to 3.18 minimum version

* Updated release note

CMakeFilters.cmake

@@ -33,9 +33,7 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT
     set (ZLIB_URL ${TGZPATH}/${ZLIB_TGZ_NAME})
     if (NOT EXISTS "${ZLIB_URL}")
       set (HDF5_ENABLE_Z_LIB_SUPPORT OFF CACHE BOOL "" FORCE)
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "Filter ZLIB file ${ZLIB_URL} not found")
-        message (VERBOSE "Filter ZLIB file ${ZLIB_URL} not found")
-      endif ()
     endif ()
     set (SZIP_URL ${TGZPATH}/${SZIP_TGZ_NAME})
     if (USE_LIBAEC)
@@ -43,9 +41,7 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT
     endif ()
     if (NOT EXISTS "${SZIP_URL}")
       set (HDF5_ENABLE_SZIP_SUPPORT OFF CACHE BOOL "" FORCE)
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "Filter SZIP file ${SZIP_URL} not found")
-        message (VERBOSE "Filter SZIP file ${SZIP_URL} not found")
-      endif ()
     endif ()
   else ()
     set (ZLIB_USE_EXTERNAL 0)
@@ -81,9 +77,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
         set (H5_HAVE_FILTER_DEFLATE 1)
         set (H5_HAVE_ZLIB_H 1)
         set (H5_HAVE_LIBZ 1)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "Filter HDF5_ZLIB is built")
-          message (VERBOSE "Filter HDF5_ZLIB is built")
-        endif ()
       else ()
         message (FATAL_ERROR " ZLib is Required for ZLib support in HDF5")
       endif ()
@@ -99,9 +93,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
   endif ()
   set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_STATIC_LIBRARY})
   INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "Filter HDF5_ZLIB is ON")
-    message (VERBOSE "Filter HDF5_ZLIB is ON")
-  endif ()
 endif ()
 
 #-----------------------------------------------------------------------------
@@ -142,13 +134,9 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
       set (H5_HAVE_FILTER_SZIP 1)
       set (H5_HAVE_SZLIB_H 1)
       set (H5_HAVE_LIBSZ 1)
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "Filter SZIP is built")
-        message (VERBOSE "Filter SZIP is built")
-      endif ()
       if (USE_LIBAEC)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "... with library AEC")
-          message (VERBOSE "... with library AEC")
-        endif ()
         set (SZIP_PACKAGE_NAME ${LIBAEC_PACKAGE_NAME})
       else ()
         set (SZIP_PACKAGE_NAME ${SZIP_PACKAGE_NAME})
@@ -159,9 +147,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
   endif ()
   set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_STATIC_LIBRARY})
   INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS})
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "Filter SZIP is ON")
-    message (VERBOSE "Filter SZIP is ON")
-  endif ()
   if (H5_HAVE_FILTER_SZIP)
     set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DECODE")
   endif ()

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5 C)
 
 if (POLICY CMP0074)
@@ -39,16 +39,6 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
       )
 endif ()
 
-# CMake version 3.14 added option --ignore-eol to compare files
-#     cmake -E compare_files --ignore-eol file1 file2
-set (CMAKE_IGNORE_EOL "--ignore-eol")
-if (CMAKE_VERSION VERSION_LESS "3.14.0")
-  set (CMAKE_IGNORE_EOL "")
-  if (WIN32)
-    message (FATAL_ERROR "Windows builds require a minimum of CMake 3.14")
-  endif()
-endif ()
-
 #-----------------------------------------------------------------------------
 # Instructions for use : Sub-Project Build
 #
@@ -250,9 +240,7 @@ string (REGEX REPLACE ".*#define[ \t]+H5_VERS_RELEASE[ \t]+([0-9]*).*$"
     "\\1" H5_VERS_RELEASE ${_h5public_h_contents})
 string (REGEX REPLACE ".*#define[ \t]+H5_VERS_SUBRELEASE[ \t]+\"([0-9A-Za-z._-]*)\".*$"
     "\\1" H5_VERS_SUBRELEASE ${_h5public_h_contents})
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+message (TRACE "VERSION: ${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}-${H5_VERS_SUBRELEASE}")
-  message (TRACE "VERSION: ${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}-${H5_VERS_SUBRELEASE}")
-endif ()
 
 #-----------------------------------------------------------------------------
 # parse the full soversion number from config/lt_vers.am and include in H5_SOVERS_INFO
@@ -265,9 +253,7 @@ string (REGEX REPLACE ".*LT_VERS_REVISION[ \t]+=[ \t]+([0-9]*).*$"
 string (REGEX REPLACE ".*LT_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
     "\\1" H5_LIB_SOVERS_RELEASE ${_lt_vers_am_contents})
 math (EXPR H5_LIB_SOVERS_MAJOR ${H5_LIB_SOVERS_INTERFACE}-${H5_LIB_SOVERS_RELEASE})
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+message (VERBOSE "SOVERSION: ${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
-  message (VERBOSE "SOVERSION: ${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
-endif ()
 string (REGEX MATCH ".*LT_TOOLS_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_TOOLS_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_TOOLS_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_TOOLS_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
@@ -277,9 +263,7 @@ if (H5_TOOLS_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_TOOLS_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_TOOLS_SOVERS_RELEASE ${_lt_vers_am_contents})
   math (EXPR H5_TOOLS_SOVERS_MAJOR ${H5_TOOLS_SOVERS_INTERFACE}-${H5_TOOLS_SOVERS_RELEASE})
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "SOVERSION_TOOLS: ${H5_TOOLS_SOVERS_MAJOR}.${H5_TOOLS_SOVERS_RELEASE}.${H5_TOOLS_SOVERS_MINOR}")
-    message (VERBOSE "SOVERSION_TOOLS: ${H5_TOOLS_SOVERS_MAJOR}.${H5_TOOLS_SOVERS_RELEASE}.${H5_TOOLS_SOVERS_MINOR}")
-  endif ()
 endif ()
 string (REGEX MATCH ".*LT_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_CXX_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_CXX_SOVERS_EXISTS)
@@ -290,9 +274,7 @@ if (H5_CXX_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_CXX_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_CXX_SOVERS_RELEASE ${_lt_vers_am_contents})
   math (EXPR H5_CXX_SOVERS_MAJOR ${H5_CXX_SOVERS_INTERFACE}-${H5_CXX_SOVERS_RELEASE})
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "SOVERSION_CXX: ${H5_CXX_SOVERS_MAJOR}.${H5_CXX_SOVERS_RELEASE}.${H5_CXX_SOVERS_MINOR}")
-    message (VERBOSE "SOVERSION_CXX: ${H5_CXX_SOVERS_MAJOR}.${H5_CXX_SOVERS_RELEASE}.${H5_CXX_SOVERS_MINOR}")
-  endif ()
 endif ()
 string (REGEX MATCH ".*LT_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_F_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_F_SOVERS_EXISTS)
@@ -303,9 +285,7 @@ if (H5_F_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_F_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_F_SOVERS_RELEASE ${_lt_vers_am_contents})
   math (EXPR H5_F_SOVERS_MAJOR ${H5_F_SOVERS_INTERFACE}-${H5_F_SOVERS_RELEASE})
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "SOVERSION_F: ${H5_F_SOVERS_MAJOR}.${H5_F_SOVERS_RELEASE}.${H5_F_SOVERS_MINOR}")
-    message (VERBOSE "SOVERSION_F: ${H5_F_SOVERS_MAJOR}.${H5_F_SOVERS_RELEASE}.${H5_F_SOVERS_MINOR}")
-  endif ()
 endif ()
 string (REGEX MATCH ".*LT_HL_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_HL_SOVERS_EXISTS)
@@ -316,9 +296,7 @@ if (H5_HL_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_HL_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_HL_SOVERS_RELEASE ${_lt_vers_am_contents})
   math (EXPR H5_HL_SOVERS_MAJOR ${H5_HL_SOVERS_INTERFACE}-${H5_HL_SOVERS_RELEASE})
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "SOVERSION_HL: ${H5_HL_SOVERS_MAJOR}.${H5_HL_SOVERS_RELEASE}.${H5_HL_SOVERS_MINOR}")
-    message (VERBOSE "SOVERSION_HL: ${H5_HL_SOVERS_MAJOR}.${H5_HL_SOVERS_RELEASE}.${H5_HL_SOVERS_MINOR}")
-  endif ()
 endif ()
 string (REGEX MATCH ".*LT_HL_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_CXX_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_HL_CXX_SOVERS_EXISTS)
@@ -329,9 +307,7 @@ if (H5_HL_CXX_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_HL_CXX_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_HL_CXX_SOVERS_RELEASE ${_lt_vers_am_contents})
   math (EXPR H5_HL_CXX_SOVERS_MAJOR ${H5_HL_CXX_SOVERS_INTERFACE}-${H5_HL_CXX_SOVERS_RELEASE})
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "SOVERSION_HL_CXX: ${H5_HL_CXX_SOVERS_MAJOR}.${H5_HL_CXX_SOVERS_RELEASE}.${H5_HL_CXX_SOVERS_MINOR}")
-    message (VERBOSE "SOVERSION_HL_CXX: ${H5_HL_CXX_SOVERS_MAJOR}.${H5_HL_CXX_SOVERS_RELEASE}.${H5_HL_CXX_SOVERS_MINOR}")
-  endif ()
 endif ()
 string (REGEX MATCH ".*LT_HL_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_F_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_HL_F_SOVERS_EXISTS)
@@ -342,9 +318,7 @@ if (H5_HL_F_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_HL_F_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_HL_F_SOVERS_RELEASE ${_lt_vers_am_contents})
   math (EXPR H5_HL_F_SOVERS_MAJOR ${H5_HL_F_SOVERS_INTERFACE}-${H5_HL_F_SOVERS_RELEASE})
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "SOVERSION_HL_F: ${H5_HL_F_SOVERS_MAJOR}.${H5_HL_F_SOVERS_RELEASE}.${H5_HL_F_SOVERS_MINOR}")
-    message (VERBOSE "SOVERSION_HL_F: ${H5_HL_F_SOVERS_MAJOR}.${H5_HL_F_SOVERS_RELEASE}.${H5_HL_F_SOVERS_MINOR}")
-  endif ()
 endif ()
 string (REGEX MATCH ".*LT_JAVA_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_JAVA_SOVERS_EXISTS ${_lt_vers_am_contents})
 if(H5_JAVA_SOVERS_EXISTS)
@@ -355,9 +329,7 @@ if(H5_JAVA_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_JAVA_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_JAVA_SOVERS_RELEASE ${_lt_vers_am_contents})
   math (EXPR H5_JAVA_SOVERS_MAJOR ${H5_JAVA_SOVERS_INTERFACE}-${H5_JAVA_SOVERS_RELEASE})
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "SOVERSION_JAVA: ${H5_JAVA_SOVERS_MAJOR}.${H5_JAVA_SOVERS_RELEASE}.${H5_JAVA_SOVERS_MINOR}")
-    message (VERBOSE "SOVERSION_JAVA: ${H5_JAVA_SOVERS_MAJOR}.${H5_JAVA_SOVERS_RELEASE}.${H5_JAVA_SOVERS_MINOR}")
-  endif ()
 endif ()
 
 #-----------------------------------------------------------------------------
@@ -880,42 +852,32 @@ option (HDF5_ENABLE_THREADSAFE "Enable thread-safety" OFF)
 if (HDF5_ENABLE_THREADSAFE)
   # check for unsupported options
   if (WIN32)
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE " **** thread-safety option not supported with static library **** ")
-      message (VERBOSE " **** thread-safety option not supported with static library **** ")
+    message (VERBOSE " **** thread-safety option will not be used building static library **** ")
-      message (VERBOSE " **** thread-safety option will not be used building static library **** ")
-    endif ()
   endif ()
   if (HDF5_BUILD_FORTRAN)
     if (NOT ALLOW_UNSUPPORTED)
       message (FATAL_ERROR " **** Fortran and thread-safety options are not supported, override with ALLOW_UNSUPPORTED option **** ")
     else ()
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE " **** Allowing unsupported Fortran and thread-safety options **** ")
-        message (VERBOSE " **** Allowing unsupported Fortran and thread-safety options **** ")
-      endif ()
     endif ()
   endif ()
   if (HDF5_BUILD_CPP_LIB)
     if (NOT ALLOW_UNSUPPORTED)
       message (FATAL_ERROR " **** C++ and thread-safety options are not supported, override with ALLOW_UNSUPPORTED option **** ")
     else ()
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE " **** Allowing unsupported C++ and thread-safety options **** ")
-        message (VERBOSE " **** Allowing unsupported C++ and thread-safety options **** ")
-      endif ()
     endif ()
   endif ()
   if (HDF5_BUILD_HL_LIB)
     if (NOT ALLOW_UNSUPPORTED)
       message (FATAL_ERROR " **** HL and thread-safety options are not supported, override with ALLOW_UNSUPPORTED option **** ")
     else ()
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE " **** Allowing unsupported HL and thread-safety options **** ")
-        message (VERBOSE " **** Allowing unsupported HL and thread-safety options **** ")
-      endif ()
     endif ()
   endif ()
   if (H5_HAVE_IOEO)
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE " **** Win32 threads requires WINVER>=0x600 (Windows Vista/7/8) **** ")
-      message (VERBOSE " **** Win32 threads requires WINVER>=0x600 (Windows Vista/7/8) **** ")
-    endif ()
     set (H5_HAVE_WIN_THREADS 1)
   else ()
     if (NOT H5_HAVE_PTHREAD_H)
@@ -1149,9 +1111,7 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for
   if (HDF5_BUILD_FORTRAN)
     include (${HDF_RESOURCES_DIR}/HDFUseFortran.cmake)
 
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "Fortran compiler ID is ${CMAKE_Fortran_COMPILER_ID}")
-      message (VERBOSE "Fortran compiler ID is ${CMAKE_Fortran_COMPILER_ID}")
-    endif ()
     include (${HDF_RESOURCES_DIR}/HDFFortranCompilerFlags.cmake)
     include (${HDF_RESOURCES_DIR}/HDF5UseFortran.cmake)
     set (LINK_Fortran_LIBS ${LINK_LIBS})
@@ -1200,9 +1160,7 @@ if (EXISTS "${HDF5_SOURCE_DIR}/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/c++")
       if (NOT ALLOW_UNSUPPORTED)
         message (FATAL_ERROR " **** Parallel and C++ options are mutually exclusive, override with ALLOW_UNSUPPORTED option **** ")
       else ()
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE " **** Allowing unsupported Parallel and C++ options **** ")
-          message (VERBOSE " **** Allowing unsupported Parallel and C++ options **** ")
-        endif ()
       endif ()
     endif ()
 

c++/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_CPP CXX)
 
 add_subdirectory (src)

c++/examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_CPP_EXAMPLES CXX)
 
 # --------------------------------------------------------------------

c++/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_CPP_SRC CXX)
 
 #-----------------------------------------------------------------------------

c++/test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_CPP_TEST CXX)
 
 # --------------------------------------------------------------------

config/cmake/CTestScript.cmake

@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 ########################################################
 # For any comments please contact cdashhelp@hdfgroup.org
 #

config/cmake/ConfigureChecks.cmake

@@ -187,9 +187,7 @@ macro (HDF_FUNCTION_TEST OTHER_TEST)
       )
     endif ()
 
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (TRACE "Performing ${OTHER_TEST}")
-      message (TRACE "Performing ${OTHER_TEST}")
-    endif ()
     try_compile (${OTHER_TEST}
         ${CMAKE_BINARY_DIR}
         ${HDF_RESOURCES_DIR}/HDFTests.c
@@ -199,13 +197,9 @@ macro (HDF_FUNCTION_TEST OTHER_TEST)
     )
     if (${OTHER_TEST})
       set (${HDF_PREFIX}_${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}")
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
-        message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
-      endif ()
     else ()
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
-        message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
-      endif ()
       set (${HDF_PREFIX}_${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}")
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
           "Performing Other Test ${OTHER_TEST} failed with the following output:\n"
@@ -259,23 +253,17 @@ if (MINGW OR NOT WINDOWS)
           set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
           set (LARGEFILE 1)
           set (HDF_EXTRA_FLAGS ${HDF_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
-          if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+          message (VERBOSE "${msg}... yes")
-            message (VERBOSE "${msg}... yes")
-          endif ()
         else ()
           set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-          if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+          message (VERBOSE "${msg}... no")
-            message (VERBOSE "${msg}... no")
-          endif ()
           file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
                 "Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n"
           )
         endif ()
       else ()
         set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "${msg}... no")
-            message (VERBOSE "${msg}... no")
-        endif ()
         file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
             "Test TEST_LFS_WORKS Compile failed\n"
         )
@@ -308,15 +296,11 @@ endif ()
 macro (HDF_CHECK_TYPE_SIZE type var)
   set (aType ${type})
   set (aVar  ${var})
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (TRACE "Checking size of ${aType} and storing into ${aVar}")
-    message (TRACE "Checking size of ${aType} and storing into ${aVar}")
-  endif ()
   CHECK_TYPE_SIZE (${aType}   ${aVar})
   if (NOT ${aVar})
     set (${aVar} 0 CACHE INTERNAL "SizeOf for ${aType}")
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (TRACE "Size of ${aType} was NOT Found")
-      message (TRACE "Size of ${aType} was NOT Found")
-    endif ()
   endif ()
 endmacro ()
 
@@ -507,9 +491,7 @@ endif ()
 #-----------------------------------------------------------------------------
 if (WINDOWS)
   if (NOT HDF_NO_IOEO_TEST)
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "Checking for InitOnceExecuteOnce:")
-      message (VERBOSE "Checking for InitOnceExecuteOnce:")
-    endif ()
   if (NOT DEFINED ${HDF_PREFIX}_HAVE_IOEO)
     if (LARGEFILE)
       set (CMAKE_REQUIRED_DEFINITIONS
@@ -538,9 +520,7 @@ if (WINDOWS)
     # if the return value was 0 then it worked
     if ("${HAVE_IOEO_EXITCODE}" EQUAL 0)
       set (${HDF_PREFIX}_HAVE_IOEO 1 CACHE INTERNAL "Test InitOnceExecuteOnce")
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "Performing Test InitOnceExecuteOnce - Success")
-        message (VERBOSE "Performing Test InitOnceExecuteOnce - Success")
-      endif ()
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
         "Performing C SOURCE FILE Test InitOnceExecuteOnce succeeded with the following output:\n"
         "${OUTPUT}\n"
@@ -552,9 +532,7 @@ if (WINDOWS)
         set (${HDF_PREFIX}_HAVE_IOEO "" CACHE INTERNAL "Test InitOnceExecuteOnce")
       endif ()
 
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "Performing Test InitOnceExecuteOnce - Failed")
-        message (VERBOSE "Performing Test InitOnceExecuteOnce - Failed")
-      endif ()
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
         "Performing InitOnceExecuteOnce Test  failed with the following output:\n"
         "${OUTPUT}\n"
@@ -717,18 +695,14 @@ if (NOT WINDOWS)
         add_definitions ("-D_GNU_SOURCE")
       else ()
         set (TEST_DIRECT_VFD_WORKS "" CACHE INTERNAL ${msg})
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "${msg}... no")
-          message (VERBOSE "${msg}... no")
-        endif ()
         file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
               "Test TEST_DIRECT_VFD_WORKS Run failed with the following output and exit code:\n ${OUTPUT}\n"
         )
       endif ()
     else ()
       set (TEST_DIRECT_VFD_WORKS "" CACHE INTERNAL ${msg})
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "${msg}... no")
-        message (VERBOSE "${msg}... no")
-      endif ()
       file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
           "Test TEST_DIRECT_VFD_WORKS Compile failed with the following output:\n ${OUTPUT}\n"
       )
@@ -794,9 +768,7 @@ endif ()
 #-----------------------------------------------------------------------------
 set (RUN_OUTPUT_PATH_DEFAULT ${CMAKE_BINARY_DIR})
 macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR RETURN_OUTPUT_VAR)
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "Detecting C ${FUNCTION_NAME}")
-      message (VERBOSE "Detecting C ${FUNCTION_NAME}")
-    endif ()
     file (WRITE
         ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler1.c
         ${SOURCE_CODE}
@@ -811,29 +783,23 @@ macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR RETURN_OUTPUT_VAR)
 
     set (${RETURN_OUTPUT_VAR} ${OUTPUT_VAR})
 
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
-      message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
+    message (VERBOSE "Test COMPILE_RESULT_VAR ${COMPILE_RESULT_VAR} ")
-      message (VERBOSE "Test COMPILE_RESULT_VAR ${COMPILE_RESULT_VAR} ")
+    message (VERBOSE "Test COMPILE_OUTPUT ${COMPILEOUT} ")
-      message (VERBOSE "Test COMPILE_OUTPUT ${COMPILEOUT} ")
+    message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
-      message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
+    message (VERBOSE "Test RUN_RESULT_VAR ${RUN_RESULT_VAR} ")
-      message (VERBOSE "Test RUN_RESULT_VAR ${RUN_RESULT_VAR} ")
+    message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
-      message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
-    endif ()
 
     if (COMPILE_RESULT_VAR)
       if (RUN_RESULT_VAR EQUAL "0")
         set (${RETURN_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")
-          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")
-          message (VERBOSE "Testing C ${FUNCTION_NAME} - Fail")
-        endif ()
         set (${RETURN_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"
@@ -906,23 +872,17 @@ macro (H5ConversionTests TEST msg)
     if (${TEST}_COMPILE)
       if (${TEST}_RUN EQUAL "0")
         set (${TEST} 1 CACHE INTERNAL ${msg})
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "${msg}... yes")
-          message (VERBOSE "${msg}... yes")
-        endif ()
       else ()
         set (${TEST} "" CACHE INTERNAL ${msg})
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "${msg}... no")
-          message (VERBOSE "${msg}... no")
-        endif ()
         file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
               "Test ${TEST} Run failed with the following output and exit code:\n ${OUTPUT}\n"
         )
       endif ()
     else ()
       set (${TEST} "" CACHE INTERNAL ${msg})
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+      message (VERBOSE "${msg}... no")
-        message (VERBOSE "${msg}... no")
-      endif ()
       file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
           "Test ${TEST} Compile failed with the following output:\n ${OUTPUT}\n"
       )

config/cmake/FindMFU.cmake

@@ -89,9 +89,7 @@ if (NOT MFU_FOUND)
       "Mfu was not found. Make sure MFU_LIBRARY and MFU_INCLUDE_DIR are set or set the MFU_INSTALL environment variable."
   )
   if (NOT MFU_FIND_QUIETLY)
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "${MFU_DIR_MESSAGE}")
-      message (VERBOSE "${MFU_DIR_MESSAGE}")
-    endif ()
   else ()
     if (MFU_FIND_REQUIRED)
       message (FATAL_ERROR "Mfu was NOT found and is Required by this project")

config/cmake/FindSZIP.cmake

@@ -118,9 +118,7 @@ if (NOT SZIP_FOUND)
       "SZip was not found. Make sure SZIP_LIBRARY and SZIP_INCLUDE_DIR are set or set the SZIP_INSTALL environment variable."
   )
   if (NOT SZIP_FIND_QUIETLY)
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "${SZIP_DIR_MESSAGE}")
-      message (VERBOSE "${SZIP_DIR_MESSAGE}")
-    endif ()
   else ()
     if (SZIP_FIND_REQUIRED)
       message (FATAL_ERROR "SZip was NOT found and is Required by this project")

config/cmake/HDF5PluginMacros.cmake

@@ -14,9 +14,7 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
     )
   endif ()
   FetchContent_GetProperties(PLUGIN)
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
-    message (VERBOSE "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
-  endif ()
   if(NOT PLUGIN_POPULATED)
     FetchContent_Populate(PLUGIN)
     include (${HDF_RESOURCES_DIR}/HDF5PluginCache.cmake)
@@ -68,9 +66,7 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
       target_include_directories (h5ex_d_zfp PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
     endif ()
   endif ()
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
-    message (VERBOSE "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
-  endif ()
   set (PLUGIN_BINARY_DIR "${plugin_BINARY_DIR}")
   set (PLUGIN_SOURCE_DIR "${plugin_SOURCE_DIR}")
   set (PLUGIN_LIBRARY "PLUGIN")

config/cmake/HDF5UseFortran.cmake

@@ -19,10 +19,8 @@ enable_language (Fortran)
 set (HDF_PREFIX "H5")
 include (CheckFortranFunctionExists)
 
-if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
+include (CheckFortranSourceRuns)
-  include (CheckFortranSourceRuns)
+include (CheckFortranSourceCompiles)
-  include (CheckFortranSourceCompiles)
-endif ()
 
 # Read source line beginning at the line matching Input:"START" and ending at the line matching Input:"END"
 macro (READ_SOURCE SOURCE_START SOURCE_END RETURN_VAR)
@@ -36,9 +34,7 @@ set (RUN_OUTPUT_PATH_DEFAULT ${CMAKE_BINARY_DIR})
 # so this one is used.
 #-----------------------------------------------------------------------------
 macro (FORTRAN_RUN FUNCTION_NAME SOURCE_CODE RUN_RESULT_VAR1 COMPILE_RESULT_VAR1 RETURN_VAR RETURN_OUTPUT_VAR)
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "Detecting Fortran ${FUNCTION_NAME}")
-      message (VERBOSE "Detecting Fortran ${FUNCTION_NAME}")
-    endif ()
     file (WRITE
         ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler1.f90
         "${SOURCE_CODE}"
@@ -54,24 +50,18 @@ macro (FORTRAN_RUN FUNCTION_NAME SOURCE_CODE RUN_RESULT_VAR1 COMPILE_RESULT_VAR1
     if (${COMPILE_RESULT_VAR})
       set(${RETURN_VAR} ${RUN_RESULT_VAR})
       if (${RUN_RESULT_VAR} MATCHES 0)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "Testing Fortran ${FUNCTION_NAME} - OK")
-          message (VERBOSE "Testing Fortran ${FUNCTION_NAME} - OK")
-        endif ()
         file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
             "Determining if the Fortran ${FUNCTION_NAME} exists passed\n"
         )
       else ()
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "Testing Fortran ${FUNCTION_NAME} - Fail")
-          message (VERBOSE "Testing Fortran ${FUNCTION_NAME} - Fail")
-        endif ()
         file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
             "Determining if the Fortran ${FUNCTION_NAME} exists failed: ${RUN_RESULT_VAR}\n"
         )
       endif ()
     else ()
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "Compiling Fortran ${FUNCTION_NAME} - Fail")
-          message (VERBOSE "Compiling Fortran ${FUNCTION_NAME} - Fail")
-        endif ()
         file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
             "Determining if the Fortran ${FUNCTION_NAME} compiles failed: ${COMPILE_RESULT_VAR}\n"
         )
@@ -82,11 +72,7 @@ endmacro ()
 #  Check to see C_LONG_DOUBLE is available
 
 READ_SOURCE("PROGRAM PROG_FC_HAVE_C_LONG_DOUBLE" "END PROGRAM PROG_FC_HAVE_C_LONG_DOUBLE" SOURCE_CODE)
-if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
+check_fortran_source_compiles (${SOURCE_CODE} FORTRAN_HAVE_C_LONG_DOUBLE SRC_EXT f90)
-  check_fortran_source_compiles (${SOURCE_CODE} FORTRAN_HAVE_C_LONG_DOUBLE SRC_EXT f90)
-else ()
-  CHECK_FORTRAN_FEATURE(c_long_double "${SOURCE_CODE}" FORTRAN_HAVE_C_LONG_DOUBLE)
-endif ()
 
 if (${FORTRAN_HAVE_C_LONG_DOUBLE})
   set (${HDF_PREFIX}_FORTRAN_HAVE_C_LONG_DOUBLE 1)
@@ -97,11 +83,7 @@ endif ()
 # Check to see C_LONG_DOUBLE is different from C_DOUBLE
 
 READ_SOURCE("MODULE type_mod" "END PROGRAM PROG_FC_C_LONG_DOUBLE_EQ_C_DOUBLE" SOURCE_CODE)
-if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
+check_fortran_source_compiles (${SOURCE_CODE} FORTRAN_C_LONG_DOUBLE_IS_UNIQUE SRC_EXT f90)
-  check_fortran_source_compiles (${SOURCE_CODE} FORTRAN_C_LONG_DOUBLE_IS_UNIQUE SRC_EXT f90)
-else ()
-  CHECK_FORTRAN_FEATURE(c_long_double "${SOURCE_CODE}" FORTRAN_C_LONG_DOUBLE_IS_UNIQUE)
-endif ()
 if (${FORTRAN_C_LONG_DOUBLE_IS_UNIQUE})
   set (${HDF_PREFIX}_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE 1)
 else ()
@@ -212,9 +194,7 @@ string (REGEX REPLACE " " "" pack_int_sizeof "${pack_int_sizeof}")
 
 set (PAC_FC_ALL_INTEGER_KINDS_SIZEOF "\{${pack_int_sizeof}\}")
 
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+message (VERBOSE "....FOUND SIZEOF for INTEGER KINDs ${PAC_FC_ALL_INTEGER_KINDS_SIZEOF}")
-  message (VERBOSE "....FOUND SIZEOF for INTEGER KINDs ${PAC_FC_ALL_INTEGER_KINDS_SIZEOF}")
-endif ()
 # **********
 # REALS
 # **********

config/cmake/HDF5_Examples.cmake.in

@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 ###############################################################################################################
 # This script will build and run the examples from a folder
 # Execute from a command line:

config/cmake/HDFCXXCompilerFlags.cmake

@@ -17,9 +17,7 @@ set (CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set (CMAKE_CXX_EXTENSIONS OFF)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_SANITIZER_FLAGS} ${CMAKE_CXX_FLAGS}")
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+message (VERBOSE "Warnings Configuration: CXX default: ${CMAKE_CXX_FLAGS}")
-  message (VERBOSE "Warnings Configuration: CXX default: ${CMAKE_CXX_FLAGS}")
-endif ()
 #-----------------------------------------------------------------------------
 # Compiler specific flags : Shouldn't there be compiler tests for these
 #-----------------------------------------------------------------------------
@@ -140,9 +138,7 @@ else ()
   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
     list (APPEND HDF5_CMAKE_CXX_FLAGS "-Minform=inform")
   endif ()
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "CMAKE_CXX_FLAGS_GENERAL=${HDF5_CMAKE_CXX_FLAGS}")
-    message (VERBOSE "CMAKE_CXX_FLAGS_GENERAL=${HDF5_CMAKE_CXX_FLAGS}")
-  endif ()
 endif ()
 
 #-----------------------------------------------------------------------------

config/cmake/HDFCompilerFlags.cmake

@@ -14,9 +14,7 @@ set(CMAKE_C_STANDARD_REQUIRED TRUE)
 
 set (CMAKE_C_FLAGS "${CMAKE_C99_STANDARD_COMPILE_OPTION} ${CMAKE_C_FLAGS}")
 set (CMAKE_C_FLAGS "${CMAKE_C_SANITIZER_FLAGS} ${CMAKE_C_FLAGS}")
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+message (VERBOSE "Warnings Configuration: C default: ${CMAKE_C_FLAGS}")
-  message (VERBOSE "Warnings Configuration: C default: ${CMAKE_C_FLAGS}")
-endif ()
 #-----------------------------------------------------------------------------
 # Compiler specific flags : Shouldn't there be compiler tests for these
 #-----------------------------------------------------------------------------
@@ -163,9 +161,7 @@ else ()
   elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI")
     list (APPEND HDF5_CMAKE_C_FLAGS "-Minform=inform")
   endif ()
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
-    message (VERBOSE "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
-  endif ()
 endif ()
 
 #-----------------------------------------------------------------------------

config/cmake/HDFFortranCompilerFlags.cmake

@@ -10,9 +10,7 @@
 # help@hdfgroup.org.
 #
 
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+message (VERBOSE "Warnings Configuration: default Fortran: ${CMAKE_Fortran_FLAGS}")
-  message (VERBOSE "Warnings Configuration: default Fortran: ${CMAKE_Fortran_FLAGS}")
-endif ()
 
 #-----------------------------------------------------------------------------
 # Option to allow the user to disable compiler warnings
@@ -75,9 +73,7 @@ if (NOT MSVC AND NOT MINGW)
   elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "PGI")
     list (APPEND HDF5_CMAKE_Fortran_FLAGS "-Mfreeform" "-Mdclchk" "-Mstandard" "-Mallocatable=03")
   endif ()
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "HDF5_CMAKE_Fortran_FLAGS=${HDF5_CMAKE_Fortran_FLAGS}")
-    message (VERBOSE "HDF5_CMAKE_Fortran_FLAGS=${HDF5_CMAKE_Fortran_FLAGS}")
-  endif ()
 
   if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
     # Append more extra warning flags that only gcc 4.8+ knows about

config/cmake/HDFMacros.cmake

@@ -28,9 +28,7 @@ macro (SET_HDF_BUILD_TYPE)
     endif()
   endif()
   if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "Setting build type to 'RelWithDebInfo' as none was specified.")
-      message (VERBOSE "Setting build type to 'RelWithDebInfo' as none was specified.")
-    endif()
     set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
     # Set the possible values of build type for cmake-gui
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
@@ -448,19 +446,6 @@ macro (HDF_DIR_PATHS package_prefix)
       set (CMAKE_GENERIC_PROGRAM_FILES)
     endif ()
   endif ()
-
-#-----------------------------------------------------------------------------
-# Setup pre-3.14 FetchContent
-#-----------------------------------------------------------------------------
-  if(${CMAKE_VERSION} VERSION_LESS 3.14)
-    macro(FetchContent_MakeAvailable NAME)
-        FetchContent_GetProperties(${NAME})
-        if(NOT ${NAME}_POPULATED)
-            FetchContent_Populate(${NAME})
-            add_subdirectory(${${NAME}_SOURCE_DIR} ${${NAME}_BINARY_DIR})
-        endif()
-    endmacro()
-  endif()
 endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)

config/cmake/HDFUseFortran.cmake

@@ -16,10 +16,8 @@
 enable_language (Fortran)
 set (HDF_PREFIX "H5")
 
-if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
+include (CheckFortranSourceRuns)
-  include (CheckFortranSourceRuns)
+include (CheckFortranSourceCompiles)
-  include (CheckFortranSourceCompiles)
-endif ()
 
 #-------------------------------------------------------------------------------
 #  Fix Fortran flags if we are compiling statically on Windows using
@@ -119,98 +117,15 @@ set (ISO_C_BINDING_CODE
   "
 )
 
-if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
+if (HDF5_REQUIRED_LIBRARIES)
-  if (HDF5_REQUIRED_LIBRARIES)
+  set (CMAKE_REQUIRED_LIBRARIES "${HDF5_REQUIRED_LIBRARIES}")
-    set (CMAKE_REQUIRED_LIBRARIES "${HDF5_REQUIRED_LIBRARIES}")
-  endif ()
-  check_fortran_source_compiles (${SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_SIZEOF SRC_EXT f90)
-  check_fortran_source_compiles (${C_SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_C_SIZEOF SRC_EXT f90)
-  check_fortran_source_compiles (${STORAGE_SIZE_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_STORAGE_SIZE SRC_EXT f90)
-  check_fortran_source_compiles (${ISO_FORTRAN_ENV_CODE} ${HDF_PREFIX}_HAVE_ISO_FORTRAN_ENV SRC_EXT f90)
-  check_fortran_source_compiles (${REALISNOTDOUBLE_CODE} ${HDF_PREFIX}_FORTRAN_DEFAULT_REAL_NOT_DOUBLE SRC_EXT f90)
-  check_fortran_source_compiles (${ISO_C_BINDING_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_ISO_C_BINDING SRC_EXT f90)
-else ()
-  #-----------------------------------------------------------------------------
-  # The provided CMake Fortran macros don't provide a general check function
-  # so this one is used for a sizeof test.
-  #-----------------------------------------------------------------------------
-  macro (CHECK_FORTRAN_FEATURE FUNCTION CODE VARIABLE)
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE "Testing Fortran ${FUNCTION}")
-      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/testFortranCompiler.f90
-          "${CODE}"
-      )
-      TRY_COMPILE (RESULT_VAR
-          ${CMAKE_BINARY_DIR}
-          ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f90
-          CMAKE_FLAGS "${CHECK_FUNCTION_EXISTS_ADD_LIBRARIES}"
-          OUTPUT_VARIABLE OUTPUT
-      )
-
-  #    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-  #      message (TRACE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
-  #      message (TRACE "Test result ${OUTPUT}")
-  #      message (TRACE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
-  #    endif ()
-
-      if (${RESULT_VAR})
-        set (${VARIABLE} 1 CACHE INTERNAL "Have Fortran function ${FUNCTION}")
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Testing Fortran ${FUNCTION} - OK")
-        endif ()
-        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-            "Determining if the Fortran ${FUNCTION} exists passed with the following output:\n"
-            "${OUTPUT}\n\n"
-        )
-      else ()
-        message (STATUS "Testing Fortran ${FUNCTION} - Fail")
-        set (${VARIABLE} 0 CACHE INTERNAL "Have Fortran function ${FUNCTION}")
-        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-            "Determining if the Fortran ${FUNCTION} exists failed with the following output:\n"
-            "${OUTPUT}\n\n")
-      endif ()
-  endmacro ()
-
-  #-----------------------------------------------------------------------------
-  # Configure Checks which require Fortran compilation must go in here
-  # not in the main ConfigureChecks.cmake files, because if the user has
-  # no Fortran compiler, problems arise.
-  #
-  # Be careful with leading spaces here, do not remove them.
-  #-----------------------------------------------------------------------------
-
-  # Check for Non-standard extension intrinsic function SIZEOF
-  set (${HDF_PREFIX}_FORTRAN_HAVE_SIZEOF FALSE)
-  CHECK_FORTRAN_FEATURE(sizeof_code ${SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_SIZEOF)
-
-  # Check for F2008 standard intrinsic function C_SIZEOF
-  set (${HDF_PREFIX}_FORTRAN_HAVE_C_SIZEOF FALSE)
-  CHECK_FORTRAN_FEATURE(c_sizeof_code ${C_SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_C_SIZEOF)
-
-  # Check for F2008 standard intrinsic function STORAGE_SIZE
-  CHECK_FORTRAN_FEATURE(storage_size_code ${STORAGE_SIZE_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_STORAGE_SIZE)
-
-  # Check for F2008 standard intrinsic module "ISO_FORTRAN_ENV"
-  set (${HDF_PREFIX}_HAVE_ISO_FORTRAN_ENV FALSE)
-  CHECK_FORTRAN_FEATURE(iso_fortran_env_code ${ISO_FORTRAN_ENV_CODE} ${HDF_PREFIX}_HAVE_ISO_FORTRAN_ENV)
-
-  set (${HDF_PREFIX}_FORTRAN_DEFAULT_REAL_NOT_DOUBLE FALSE)
-  CHECK_FORTRAN_FEATURE(realisnotdouble_code ${REALISNOTDOUBLE_CODE} ${HDF_PREFIX}_FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
-
-  #-----------------------------------------------------------------------------
-  # Checks if the ISO_C_BINDING module meets all the requirements
-  #-----------------------------------------------------------------------------
-  set (${HDF_PREFIX}_FORTRAN_HAVE_ISO_C_BINDING FALSE)
-  CHECK_FORTRAN_FEATURE(iso_c_binding_code ${ISO_C_BINDING_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_ISO_C_BINDING)
 endif ()
+check_fortran_source_compiles (${SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_SIZEOF SRC_EXT f90)
+check_fortran_source_compiles (${C_SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_C_SIZEOF SRC_EXT f90)
+check_fortran_source_compiles (${STORAGE_SIZE_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_STORAGE_SIZE SRC_EXT f90)
+check_fortran_source_compiles (${ISO_FORTRAN_ENV_CODE} ${HDF_PREFIX}_HAVE_ISO_FORTRAN_ENV SRC_EXT f90)
+check_fortran_source_compiles (${REALISNOTDOUBLE_CODE} ${HDF_PREFIX}_FORTRAN_DEFAULT_REAL_NOT_DOUBLE SRC_EXT f90)
+check_fortran_source_compiles (${ISO_C_BINDING_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_ISO_C_BINDING SRC_EXT f90)
 
 #-----------------------------------------------------------------------------
 # Add debug information (intel Fortran : JB)

config/cmake/fileCompareTest.cmake

@@ -46,66 +46,50 @@ if (TEST_STRINGS STREQUAL "YES")
 
   # now compare the outputs
   execute_process (
-      COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_ONEFILE} ${TEST_FOLDER}/${TEST_TWOFILE}
+      COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_ONEFILE} ${TEST_FOLDER}/${TEST_TWOFILE}
       RESULT_VARIABLE TEST_RESULT
   )
 
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (VERBOSE "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}-${TEST_O_STRING_LEN}")
-    message (VERBOSE "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}-${TEST_O_STRING_LEN}")
-  endif ()
   # if the return value is !=${TEST_EXPECT} bail out
   if (NOT TEST_RESULT EQUAL TEST_EXPECT)
     message (FATAL_ERROR "Failed: The output of ${TEST_FOLDER}/${TEST_ONEFILE} did not match ${TEST_FOLDER}/${TEST_TWOFILE}.\n${TEST_ERROR}")
   endif ()
 else ()
-  if (CMAKE_VERSION VERSION_LESS "3.14.0")
+  file (SIZE ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_SIZE)
-    message (FATAL_ERROR "CANNOT get file size, file command SIZE not supported")
+  file (SIZE ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_SIZE)
-  else ()
+  if (TEST_FUNCTION MATCHES "LT")
-    file (SIZE ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_SIZE)
+    if (TEST_ONE_SIZE LESS TEST_TWO_SIZE)
-    file (SIZE ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less ${TEST_FOLDER}/${TEST_TWOFILE}")
-    if (TEST_FUNCTION MATCHES "LT")
-      if (TEST_ONE_SIZE LESS TEST_TWO_SIZE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less ${TEST_FOLDER}/${TEST_TWOFILE}")
-        endif ()
-      else ()
-        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less ${TEST_FOLDER}/${TEST_TWOFILE}")
-      endif ()
-    elseif (TEST_FUNCTION MATCHES "LTEQ")
-      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-        endif ()
-      else ()
-        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-      endif ()
-    elseif (TEST_FUNCTION MATCHES "EQ")
-      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-        endif ()
-      else ()
-        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-      endif ()
-    elseif (TEST_FUNCTION MATCHES "GTEQ")
-      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-        endif ()
-      else ()
-        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-      endif ()
-    elseif (TEST_FUNCTION MATCHES "GT")
-      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater ${TEST_FOLDER}/${TEST_TWOFILE}")
-        endif ()
-      else ()
-        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater ${TEST_FOLDER}/${TEST_TWOFILE}")
-      endif ()
     else ()
-      message (FATAL_ERROR "Failed: Incorrect test size compare command provided.\n${TEST_ERROR}")
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less ${TEST_FOLDER}/${TEST_TWOFILE}")
     endif ()
+  elseif (TEST_FUNCTION MATCHES "LTEQ")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  elseif (TEST_FUNCTION MATCHES "EQ")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  elseif (TEST_FUNCTION MATCHES "GTEQ")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  elseif (TEST_FUNCTION MATCHES "GT")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  else ()
+    message (FATAL_ERROR "Failed: Incorrect test size compare command provided.\n${TEST_ERROR}")
   endif ()
 endif ()
 

config/cmake/grepTest.cmake

@@ -49,9 +49,7 @@ endif ()
 
 if (TEST_ENV_VAR)
   set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}")
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+  message (TRACE "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
-    message (TRACE "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
-  endif ()
 endif ()
 
 # run the test program, capture the stdout/stderr and the result var
@@ -112,7 +110,7 @@ if (TEST_ERRREF)
         if (NOT TEST_SORT_COMPARE)
           # now compare the output with the reference
           execute_process (
-              COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+              COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
               RESULT_VARIABLE TEST_COMPARE_RESULT
           )
         else ()

config/cmake/jrunTest.cmake

@@ -148,7 +148,7 @@ if (NOT TEST_SKIP_COMPARE)
       if (NOT TEST_SORT_COMPARE)
         # now compare the output with the reference
         execute_process (
-            COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+            COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
             RESULT_VARIABLE TEST_COMPARE_RESULT
         )
       else ()
@@ -218,7 +218,7 @@ if (NOT TEST_SKIP_COMPARE)
 
       # now compare the error output with the error reference
       execute_process (
-          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
+          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
           RESULT_VARIABLE TEST_ERRREF_RESULT
       )
       if (TEST_ERRREF_RESULT)

config/cmake/runTest.cmake

@@ -212,19 +212,19 @@ if (NOT TEST_SKIP_COMPARE)
     file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
     list (LENGTH TEST_STREAM test_len)
     if (test_len GREATER 0)
-      if (WIN32)
+    #  if (WIN32) # no longer needed for CMake > 3.15
-        configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
+    #    configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
-        if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
+    #    if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
-          file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+    #      file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
-        endif ()
+    #    endif ()
-        #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+    #    #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-        #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+    #    #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
-      endif ()
+    #  endif ()
 
       if (NOT TEST_SORT_COMPARE)
         # now compare the output with the reference
         execute_process (
-            COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+            COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
             RESULT_VARIABLE TEST_COMPARE_RESULT
         )
       else ()
@@ -287,18 +287,18 @@ if (NOT TEST_SKIP_COMPARE)
     file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
     list (LENGTH TEST_STREAM test_len)
     if (test_len GREATER 0)
-      if (WIN32)
+    #  if (WIN32) # no longer needed for CMake > 3.15
-        configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
+    #    configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
-        if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
+    #    if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
-          file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+    #      file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
-        endif ()
+    #    endif ()
-        #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+    #    #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-        #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
+    #    #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
-      endif ()
+    #  endif ()
 
       # now compare the error output with the error reference
       execute_process (
-          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
+          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
           RESULT_VARIABLE TEST_ERRREF_RESULT
       )
       if (TEST_ERRREF_RESULT)

config/cmake/scripts/CTestScript.cmake

@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 ########################################################
 # This dashboard is maintained by The HDF Group
 # For any comments please contact cdashhelp@hdfgroup.org

config/cmake/scripts/HDF5config.cmake

@@ -15,7 +15,7 @@
 ### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -VV -O hdf5.log         ###
 #############################################################################################
 
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 ############################################################################
 # Usage:
 #     ctest -S HDF5config.cmake,OPTION=VALUE -C Release -VV -O test.log

config/cmake/userblockTest.cmake

@@ -102,7 +102,7 @@ if (TEST_CHECKUB STREQUAL "YES")
 
   # now compare the outputs
   execute_process (
-      COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_HFILE}-ub.cmp ${TEST_HFILE}.cmp
+      COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_HFILE}-ub.cmp ${TEST_HFILE}.cmp
       RESULT_VARIABLE TEST_RESULT
   )
 

config/cmake/wait_H5Tinit.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 
 message(STATUS "Check for existence of ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c")
 execute_process(COMMAND ls ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c RESULT_VARIABLE H5TI_result OUTPUT_QUIET ERROR_QUIET)

doxygen/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_DOXYGEN C)
 
 #-----------------------------------------------------------------------------

examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_EXAMPLES C)
 
 #-----------------------------------------------------------------------------

fortran/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_F90 C Fortran)
 
 if (H5_HAVE_PARALLEL)

fortran/examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_F90_EXAMPLES C Fortran)
 # --------------------------------------------------------------------
 # Notes: When creating examples they should be prefixed

fortran/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_F90_SRC C Fortran)
 
 #-----------------------------------------------------------------------------

fortran/test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_FORTRAN_TESTS C Fortran)
 
 #-----------------------------------------------------------------------------

fortran/testpar/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_FORTRAN_TESTPAR C Fortran)
 
 #-----------------------------------------------------------------------------

hl/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL C)
 
 #-----------------------------------------------------------------------------

hl/c++/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_CPP CXX)
 
 #-----------------------------------------------------------------------------

hl/c++/examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_CPP_EXAMPLES CXX)
 
 # --------------------------------------------------------------------

hl/c++/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_CPP_SRC CXX)
 
 #-----------------------------------------------------------------------------

hl/c++/test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_CPP_TEST CXX)
 
 add_executable (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp)

hl/examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_EXAMPLES C)
 
 #-----------------------------------------------------------------------------

hl/fortran/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_F90 C Fortran)
 
 #-----------------------------------------------------------------------------

hl/fortran/examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_F90_EXAMPLES C Fortran)
 
 set (examples

hl/fortran/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_F90_SRC C Fortran)
 
 #-----------------------------------------------------------------------------

hl/fortran/test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_FORTRAN_TESTS C Fortran)
 
 #-----------------------------------------------------------------------------

hl/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_SRC C)
 
 #-----------------------------------------------------------------------------

hl/test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_TEST C)
 # --------------------------------------------------------------------
 # Notes: When creating unit test executables they should be prefixed

hl/tools/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_TOOLS C)
 
 add_subdirectory (gif2h5)

hl/tools/gif2h5/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_TOOLS_GIF2H5 C)
 
 #-----------------------------------------------------------------------------

hl/tools/h5watch/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_TOOLS_H5WATCH C)
 
 #-----------------------------------------------------------------------------

java/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_JAVA C Java)
 
 set (CMAKE_MODULE_PATH "${HDF_RESOURCES_DIR};${HDF_RESOURCES_DIR}")
@@ -9,14 +9,10 @@ find_package (Java)
 #-----------------------------------------------------------------------------
 include (${HDF_RESOURCES_DIR}/UseJava.cmake)
 
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+message (VERBOSE "JAVA: JAVA_HOME=$ENV{JAVA_HOME} JAVA_ROOT=$ENV{JAVA_ROOT}")
-  message (VERBOSE "JAVA: JAVA_HOME=$ENV{JAVA_HOME} JAVA_ROOT=$ENV{JAVA_ROOT}")
-endif ()
 find_package (JNI)
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+message (VERBOSE "JNI_LIBRARIES=${JNI_LIBRARIES}")
-  message (VERBOSE "JNI_LIBRARIES=${JNI_LIBRARIES}")
+message (VERBOSE "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
-  message (VERBOSE "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
-endif ()
 
 
 if (WIN32)

java/examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDFJAVA_EXAMPLES Java)
 
 add_subdirectory (datasets)

java/examples/datasets/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDFJAVA_EXAMPLES_DATASETS Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)

java/examples/datatypes/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDFJAVA_EXAMPLES_DATATYPES Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)

java/examples/groups/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDFJAVA_EXAMPLES_GROUPS Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)

java/examples/intro/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDFJAVA_EXAMPLES_INTRO Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)

java/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_JAVA_SRC C)
 
 #-----------------------------------------------------------------------------

java/src/hdf/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_JAVA_HDF C)
 
 add_subdirectory (hdf5lib)

java/src/hdf/hdf5lib/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_JAVA_HDF_HDF5 Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)

java/src/jni/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_JAVA_JNI C)
 
 set (HDF5_JAVA_JNI_CSRCS

java/test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_JAVA_TEST Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)

release_docs/INSTALL_CMake.txt

@@ -32,7 +32,7 @@ CMake version
    1. We suggest you obtain the latest CMake from the Kitware web site.
       The HDF5 1.13."X" product requires a minimum CMake version 3.12,
       where "X" is the current HDF5 release version. If you are using
-      VS2019, the minimum version is 3.15.
+      VS2022, the minimum version is 3.21.
 
 Note:
    To change the install prefix from the platform defaults initialize
@@ -276,7 +276,7 @@ IV. Further considerations
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5 1.13."X" product requires a minimum CMake version 3.12.
+      web site. The HDF5 1.13."X" product requires a minimum CMake version 3.18.
 
    2. If you plan to use Zlib or Szip:
       A. Download the binary packages and install them in a central location.

release_docs/README_HPC

@@ -22,7 +22,7 @@ I. Prerequisites
        from HDF5 source in a 'home' directory typically results in test
        failures and should be avoided.
 
-    2. Load modules for desired compilers, module for cmake version 3.12 or greater,
+    2. Load modules for desired compilers, module for cmake version 3.18 or greater,
        and set any needed environment variables for compilers (i.e., CC, FC, CXX).
        Unload any problematic modules (i.e., craype-hugepages2M).
 
@@ -153,11 +153,11 @@ V. Manual alternatives
 If using ctest is undesirable, one can create a build directory and run the cmake
 configure command, for example
 
-"/projects/Mutrino/hpcsoft/cle6.0/common/cmake/3.12/bin/cmake"
+"/projects/Mutrino/hpcsoft/cle6.0/common/cmake/3.18/bin/cmake"
--C "<working directory>/hdf5-1.13.0/config/cmake/cacheinit.cmake"
+-C "<working directory>/hdf5-1.13.3/config/cmake/cacheinit.cmake"
 -DCMAKE_BUILD_TYPE:STRING=Release -DHDF5_BUILD_FORTRAN:BOOL=ON
 -DHDF5_BUILD_JAVA:BOOL=OFF
--DCMAKE_INSTALL_PREFIX:PATH=<working directory>/HDF_Group/HDF5/1.13.0
+-DCMAKE_INSTALL_PREFIX:PATH=<working directory>/HDF_Group/HDF5/1.13.3
 -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF
 -DHDF5_ENABLE_PARALLEL:BOOL=ON -DHDF5_BUILD_CPP_LIB:BOOL=OFF
 -DHDF5_BUILD_JAVA:BOOL=OFF -DHDF5_ENABLE_THREADSAFE:BOOL=OFF
@@ -168,7 +168,7 @@ configure command, for example
 -DLOCAL_BATCH_SCRIPT_NAME:STRING=knl_ctestS.sl
 -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=knl_ctestP.sl -DSITE:STRING=mutrino
 -DBUILDNAME:STRING=par-knl_GCC493-SHARED-Linux-4.4.156-94.61.1.16335.0.PTF.1107299-default-x86_64
-"-GUnix Makefiles" "" "<working directory>/hdf5-1.13.0"
+"-GUnix Makefiles" "" "<working directory>/hdf5-1.13.3"
 
 followed by make and batch jobs to run tests.
 

release_docs/RELEASE.txt

@@ -47,6 +47,14 @@ New Features
 
     Configuration:
     -------------
+    - Update CMake minimum version to 3.18
+
+      Updated CMake minimum version from 3.12 to 3.18 and removed version checks
+      which were added for Windows features not yet available in version 3.12. Also
+      removed configure macros and code checks for old style code compile checks.
+
+      (ADB - 2022/08/29, HDFFV-11329)
+
     -
 
 

release_docs/USING_CMake_Examples.txt

@@ -22,7 +22,7 @@ I. Preconditions
 
    1. We suggest you obtain the latest CMake for your platform from the Kitware
       web site. The HDF5 1.13.x product requires a minimum CMake version
-      of 3.12. If you are using VS2019, the minimum version is 3.15.
+      of 3.18. If you are using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for

release_docs/USING_HDF5_CMake.txt

@@ -39,7 +39,7 @@ I. Preconditions
 
    1. We suggest you obtain the latest CMake for your platform from the Kitware
       web site. The HDF5 1.13.x product requires a minimum CMake version
-      of 3.12. If you are using VS2019, the minimum version is 3.15.
+      of 3.18. If you are using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -201,7 +201,7 @@ Given the preconditions in section I, create a CMakeLists.txt file at the
 source root. Include the following text in the file:
 
 ##########################################################
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5MyApp C CXX)
 
 set (LIB_TYPE STATIC) # or SHARED

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_SRC C)
 
 #-----------------------------------------------------------------------------

test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TEST C)
 
 #-----------------------------------------------------------------------------

testpar/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TEST_PAR C)
 
 #-----------------------------------------------------------------------------

tools/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS C)
 
 add_subdirectory (lib)

tools/lib/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_LIB C)
 
 #-----------------------------------------------------------------------------

tools/libtest/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_LIBTEST C)
 
 #-----------------------------------------------------------------------------

tools/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC C)
 
 #-- Add the h5diff and test executables

tools/src/h5copy/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_H5COPY C)
 
 # --------------------------------------------------------------------

tools/src/h5diff/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_H5DIFF C)
 
 # --------------------------------------------------------------------

tools/src/h5dump/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_H5DUMP C)
 
 # --------------------------------------------------------------------

tools/src/h5format_convert/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_H5FC C)
 
 # --------------------------------------------------------------------

tools/src/h5import/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_H5IMPORT C)
 
 # --------------------------------------------------------------------

tools/src/h5jam/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_H5JAM C)
 
 # --------------------------------------------------------------------

tools/src/h5ls/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_H5LS C)
 
 #-----------------------------------------------------------------------------

tools/src/h5perf/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_H5PERF C)
 
 # --------------------------------------------------------------------

tools/src/h5repack/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_H5REPACK C)
 
 # --------------------------------------------------------------------

tools/src/h5stat/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_H5STAT C)
 
 # --------------------------------------------------------------------

tools/src/misc/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_SRC_MISC C)
 
 # --------------------------------------------------------------------

tools/test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST C)
 
 #-- Add the h5diff tests

tools/test/h5copy/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_H5COPY C)
 
 # --------------------------------------------------------------------

tools/test/h5diff/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_H5DIFF C)
 
 # --------------------------------------------------------------------

tools/test/h5dump/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_H5DUMP C)
 
 #-----------------------------------------------------------------------------

tools/test/h5dump/CMakeTests.cmake

@@ -590,7 +590,7 @@
       )
       add_test (
           NAME H5DUMP-${resultfile}-output-cmp
-          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${resultfile}.txt ${resultfile}.exp
+          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
       )
       set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES
           DEPENDS H5DUMP-${resultfile}
@@ -655,7 +655,7 @@
       )
       add_test (
           NAME H5DUMP-${resultfile}-output-cmp
-          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${resultfile}.txt ${resultfile}.exp
+          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
       )
       set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES
           DEPENDS H5DUMP-${resultfile}
@@ -663,7 +663,7 @@
       )
       add_test (
           NAME H5DUMP-${resultfile}-output-cmp-ddl
-          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${ddlfile}.txt ${ddlfile}.exp
+          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${ddlfile}.txt ${ddlfile}.exp
       )
       set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES
           DEPENDS H5DUMP-${resultfile}-output-cmp
@@ -709,7 +709,7 @@
       )
       add_test (
           NAME H5DUMP-output-cmp-${resultfile}
-          COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${resultfile}.txt ${resultfile}.exp
+          COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
       )
       set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES
           DEPENDS H5DUMP-output-${resultfile}

tools/test/h5format_convert/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_H5FC C)
 
 # --------------------------------------------------------------------

tools/test/h5import/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_H5IMPORT C)
 
 # --------------------------------------------------------------------

tools/test/h5jam/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_H5JAM C)
 
 # --------------------------------------------------------------------

tools/test/h5ls/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_H5LS C)
 
 #-----------------------------------------------------------------------------

tools/test/h5repack/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_H5REPACK C)
 
 # --------------------------------------------------------------------

tools/test/h5repack/CMakeTests.cmake

@@ -883,11 +883,6 @@
               -D "TEST_FUNCTION=LTEQ"
               -P "${HDF_RESOURCES_DIR}/fileCompareTest.cmake"
       )
-      if (CMAKE_VERSION VERSION_LESS "3.14.0")
-        set_tests_properties (H5REPACK_META-${testname} PROPERTIES
-            DISABLED "true"
-        )
-      endif ()
       set_tests_properties (H5REPACK_META-${testname} PROPERTIES
           DEPENDS H5REPACK_META-${testname}_M_DFF
       )

tools/test/h5stat/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_H5STAT C)
 
 # --------------------------------------------------------------------

tools/test/misc/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_MISC C)
 
 # --------------------------------------------------------------------

tools/test/misc/vds/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_MISC_VDS C)
 
 macro (ADD_H5_GENERATOR genfile)

tools/test/perform/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_TOOLS_TEST_PERFORM C)
 
 #-----------------------------------------------------------------------------

utils/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_UTILS C)
 
 if (BUILD_TESTING)

utils/mirror_vfd/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_UTILS_MIRRORVFD C)
 
 #-----------------------------------------------------------------------------

utils/subfiling_vfd/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.18)
 project (HDF5_UTILS_SUBFILINGVFD C)
 
 configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.sh.in ${HDF5_BINARY_DIR}/h5fuse.sh @ONLY)