remove ABI check, require CMake >= 3.19

Author: scivision

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14...3.28)
+cmake_minimum_required(VERSION 3.19...3.28)
 
 get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if(NOT is_multi_config AND NOT (CMAKE_BUILD_TYPE OR DEFINED ENV{CMAKE_BUILD_TYPE}))

cmake/FindHDF5.cmake

@@ -60,8 +60,8 @@ Targets
 #]=======================================================================]
 
 include(CheckSymbolExists)
-include(CheckCSourceCompiles)
-include(CheckFortranSourceCompiles)
+include(CheckSourceCompiles)
+
 
 function(get_flags exec outvar)
 
@@ -146,13 +146,13 @@ endif()
 # get version
 # from CMake/Modules/FindHDF5.cmake
 file(STRINGS ${h5_conf} _def
-REGEX "^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+"
+ REGEX "^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+"
 )
 message(DEBUG "HDF5 version define: ${_def}")
 
 if("${_def}" MATCHES "H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)")
   set(HDF5_VERSION "${CMAKE_MATCH_1}")
-  endif()
+endif()
 message(DEBUG "HDF5 version match 0, 1: ${CMAKE_MATCH_0}   ${CMAKE_MATCH_1}")
 
 # avoid picking up incompatible zlib over the desired zlib
@@ -501,7 +501,7 @@ if(HDF5_ROOT)
   NO_DEFAULT_PATH
   HINTS ${HDF5_ROOT}
   PATH_SUFFIXES ${hdf5_binsuf}
-   DOC "HDF5 Fortran compiler script"
+  DOC "HDF5 Fortran compiler script"
   )
 else()
   find_program(HDF5_Fortran_COMPILER_EXECUTABLE
@@ -695,7 +695,7 @@ else()
   ]=])
 endif(HDF5_parallel_FOUND)
 
-check_c_source_compiles("${src}" HDF5_C_links)
+check_source_compiles(C "${src}" HDF5_C_links)
 
 endfunction(check_c_links)
 
@@ -736,7 +736,7 @@ else()
   end program")
 endif()
 
-check_fortran_source_compiles(${src} HDF5_Fortran_links SRC_EXT f90)
+check_source_compiles(Fortran ${src} HDF5_Fortran_links)
 
 endfunction(check_fortran_links)
 
@@ -785,6 +785,7 @@ if(NOT HDF5_ROOT)
   endif()
 endif()
 
+
 # --- library suffixes
 
 set(hdf5_lsuf lib hdf5/lib)  # need explicit "lib" for self-built HDF5

cmake/abi_check/CMakeLists.txt

@@ -1,27 +1,8 @@
-# check C and Fortran compiler ABI compatibility
-
-if(NOT abi_ok)
-  message(CHECK_START "checking that compilers can link together")
-  try_compile(abi_ok
-  ${CMAKE_CURRENT_BINARY_DIR}/abi_check ${CMAKE_CURRENT_LIST_DIR}/abi_check
-  abi_check
-  )
-  if(abi_ok)
-    message(CHECK_PASS "OK")
-  else()
-    set(err_log ${CMAKE_CURRENT_BINARY_DIR}/abi_check/CMakeError.log)
-    message(FATAL_ERROR "ABI-incompatible compilers:
-    C compiler ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}
-    Fortran compiler ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION}")
-  endif()
-endif()
-
 # --- C compile flags
 if(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU|^Intel")
   add_compile_options(
   "$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:Debug>>:-Wextra>"
-  "$<$<COMPILE_LANGUAGE:C>:-Wall>"
-  "$<$<COMPILE_LANGUAGE:C>:-Werror=implicit-function-declaration>"
+  "$<$<COMPILE_LANGUAGE:C>:-Wall;-Werror=implicit-function-declaration>"
   )
 elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
   add_compile_options("$<$<COMPILE_LANGUAGE:C>:/W3>")