cmake: make search warapper optional

rank-1 size-0 allocate

cmake: windows

Author: scivision

CMakeLists.txt

@@ -4,7 +4,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 project(hdf5iface
   LANGUAGES Fortran
-  VERSION 2.3.0
+  VERSION 2.3.1
   HOMEPAGE_URL https://github.com/scivision/h5fortran)
 enable_testing()
 

cmake/Modules/FindHDF5.cmake

@@ -132,6 +132,8 @@ The following variable can be set to guide the search for HDF5 libraries and inc
 include(SelectLibraryConfigurations)
 include(FindPackageHandleStandardArgs)
 
+cmake_policy(SET CMP0074 NEW)
+
 # List of the valid HDF5 components
 set(HDF5_VALID_LANGUAGE_BINDINGS C CXX Fortran)
 
@@ -463,15 +465,16 @@ if(NOT HDF5_ROOT)
     set(HDF5_ROOT $ENV{HDF5_ROOT})
 endif()
 if(HDF5_ROOT)
-    set(_HDF5_SEARCH_OPTS NO_DEFAULT_PATH)
+    set(_HDF5_SEARCH_OPTS NO_CMAKE_PATH NO_CMAKE_SYSTEM_PATH
+          NO_CMAKE_PACKAGE_REGISTRY NO_CMAKE_SYSTEM_PACKAGE_REGISTRY
+          NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH)
 else()
     set(_HDF5_SEARCH_OPTS)
 endif()
 
 # Try to find HDF5 using an installed hdf5-config.cmake
 if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE)
     find_package(HDF5 QUIET NO_MODULE
-      HINTS ${HDF5_ROOT}
       ${_HDF5_SEARCH_OPTS}
       )
     if( HDF5_FOUND)
@@ -552,7 +555,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE)
     endif()
 endif()
 
-if(NOT HDF5_FOUND)
+if(NOT HDF5_FOUND AND HDF5_SEARCH_WRAPPER)
   set(_HDF5_NEED_TO_SEARCH False)
   set(HDF5_COMPILER_NO_INTERROGATE True)
   # Only search for languages we've enabled
@@ -596,7 +599,6 @@ if(NOT HDF5_FOUND)
       # search options with the wrapper
       find_program(HDF5_${__lang}_COMPILER_EXECUTABLE
         NAMES ${HDF5_${__lang}_COMPILER_NAMES} NAMES_PER_DIR
-        HINTS ${HDF5_ROOT}
         PATH_SUFFIXES bin Bin
         DOC "HDF5 ${__lang} Wrapper compiler.  Used only to detect HDF5 compile flags."
         ${_HDF5_SEARCH_OPTS}
@@ -637,7 +639,6 @@ if(NOT HDF5_FOUND)
             find_library(HDF5_${__lang}_LIBRARY_${L}
               NAMES ${_HDF5_SEARCH_NAMES_LOCAL} ${L} NAMES_PER_DIR
               HINTS ${HDF5_${__lang}_LIBRARY_DIRS}
-                    ${HDF5_ROOT}
               ${_HDF5_SEARCH_OPTS_LOCAL}
               )
             unset(_HDF5_SEARCH_OPTS_LOCAL)
@@ -669,7 +670,6 @@ if(NOT HDF5_FOUND)
               find_library(HDF5_${__lang}_LIBRARY_${L}
                 NAMES ${_HDF5_SEARCH_NAMES_LOCAL} ${L} NAMES_PER_DIR
                 HINTS ${HDF5_${__lang}_LIBRARY_DIRS}
-                      ${HDF5_ROOT}
                 ${_HDF5_SEARCH_OPTS_LOCAL}
                 )
               unset(_HDF5_SEARCH_OPTS_LOCAL)
@@ -752,7 +752,6 @@ endif()
 
 find_program( HDF5_DIFF_EXECUTABLE
     NAMES h5diff
-    HINTS ${HDF5_ROOT}
     PATH_SUFFIXES bin Bin
     ${_HDF5_SEARCH_OPTS}
     DOC "HDF5 file differencing tool." )
@@ -786,7 +785,6 @@ if( NOT HDF5_FOUND )
         endif()
 
         find_path(HDF5_${__lang}_INCLUDE_DIR ${HDF5_INCLUDE_FILENAME}
-            HINTS ${HDF5_ROOT}
             PATHS $ENV{HOME}/.local/include
             PATH_SUFFIXES include Include ${_path_suffixes}
             ${_HDF5_SEARCH_OPTS}
@@ -817,19 +815,19 @@ if( NOT HDF5_FOUND )
             endif()
             find_library(HDF5_${LIB}_LIBRARY_DEBUG
                 NAMES ${THIS_LIBRARY_SEARCH_DEBUG}
-                HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
+                PATH_SUFFIXES lib Lib
                 ${_HDF5_SEARCH_OPTS}
             )
             find_library( HDF5_${LIB}_LIBRARY_RELEASE
                 NAMES ${THIS_LIBRARY_SEARCH_RELEASE}
-                HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
+                PATH_SUFFIXES lib Lib
                 ${_HDF5_SEARCH_OPTS}
             )
             # patch for HDF5 1.10.6 name change
             if(NOT HDF5_${LIB}_LIBRARY_RELEASE AND (LIB STREQUAL hdf5_hl_fortran))
               find_library( HDF5_${LIB}_LIBRARY_RELEASE
                   NAMES hdf5hl_fortran hdf5hl_fortran-shared
-                  HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
+                  PATH_SUFFIXES lib Lib
                   ${_HDF5_SEARCH_OPTS}
               )
             endif()
@@ -863,12 +861,12 @@ if( NOT HDF5_FOUND )
                 endif()
                 find_library(HDF5_${LIB}_LIBRARY_DEBUG
                     NAMES ${THIS_LIBRARY_SEARCH_DEBUG}
-                    HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
+                    PATH_SUFFIXES lib Lib
                     ${_HDF5_SEARCH_OPTS}
                 )
                 find_library( HDF5_${LIB}_LIBRARY_RELEASE
                     NAMES ${THIS_LIBRARY_SEARCH_RELEASE}
-                    HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
+                    PATH_SUFFIXES lib Lib
                     ${_HDF5_SEARCH_OPTS}
                 )
                 select_library_configurations( HDF5_${LIB} )
@@ -970,4 +968,4 @@ if (HDF5_FIND_DEBUG)
     message(STATUS "HDF5_${__lang}_HL_LIBRARY: ${HDF5_${__lang}_HL_LIBRARY}")
     message(STATUS "HDF5_${__lang}_HL_LIBRARIES: ${HDF5_${__lang}_HL_LIBRARIES}")
   endforeach()
-endif()
+endif()

cmake/compilers.cmake

@@ -2,28 +2,27 @@
 # check_fortran_source_compiles("real, dimension(1,1,1,1,1,1,1,1,1,1,1,1,1,1,1) :: x; end" f08rank15 SRC_EXT f90)
 
 if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
-  if(NOT WIN32)
-    set(FFLAGS -stand f18 -warn declarations -traceback -warn -heap-arrays)
+  if(WIN32)
+    set(CMAKE_Fortran_FLAGS "/stand:f18 /warn:declarations /traceback /warn /heap-arrays ")
   else()
-    set(FFLAGS /stand:f18 /warn:declarations /traceback /warn /heap-arrays)
-    # Note: -g is /debug:full for ifort Windows
+    set(CMAKE_Fortran_FLAGS "-stand f18 -warn declarations -traceback -warn -heap-arrays ")
   endif()
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
-  list(APPEND FFLAGS -march=native -fimplicit-none)
+  string(APPEND CMAKE_Fortran_FLAGS "-march=native -fimplicit-none ")
 
   if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    list(APPEND FFLAGS -fcheck=all)
+    string(APPEND CMAKE_Fortran_FLAGS "-fcheck=all ")
   endif()
 
   if(CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 8)
-    list(APPEND FFLAGS -std=f2018)
+    string(APPEND CMAKE_Fortran_FLAGS "-std=f2018 ")
   endif()
 
-  list(APPEND FFLAGS -Wall -Wextra -Wpedantic -Werror=array-bounds -Warray-temporaries)
+  string(APPEND CMAKE_Fortran_FLAGS "-Wall -Wextra -Wpedantic ")
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL PGI)
-  set(FFLAGS -C -Mdclchk)
+  set(CMAKE_Fortran_FLAGS "-C -Mdclchk ")
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL Flang)
-  set(FFLAGS -W)
+  set(CMAKE_Fortran_FLAGS "-W ")
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL NAG)
-  list(APPEND FFLAGS -u -C=all)
+  set(CMAKE_Fortran_FLAGS "-u -C=all ")
 endif()

cmake/hdf5.cmake

@@ -1,32 +1,38 @@
 # don't enclose this all in "if(NOT DEFINED HDF5OK)" because CMake intermittantly doesn't cache needed HDF5 variables.
-# if(BUILD_SHARED_LIBS)
-#   set(HDF5_USE_STATIC_LIBRARIES false)
-# else()
-#   set(HDF5_USE_STATIC_LIBRARIES true)
-# endif()
 
-if(WIN32)  # pkg-config is goofed up for Windows, including MSYS2
+set(HDF5_SEARCH_WRAPPER true)
+set(HDF5_USE_STATIC_LIBRARIES true)
+
+# Intel HDF5 for Windows has some real issues from the factory, this makes it work:
+if(WIN32 AND CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
   set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE true)
+  set(HDF5_SEARCH_WRAPPER false)
+  set(HDF5_USE_STATIC_LIBRARIES false)
 endif()
 
 # set(HDF5_FIND_DEBUG true)
 
-find_package(HDF5 COMPONENTS Fortran Fortran_HL)
+find_package(HDF5 REQUIRED COMPONENTS Fortran HL)
+if(MINGW)
+  set(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS}/static)
+  message(${HDF5_INCLUDE_DIRS})
+endif()
+
 set(HDF5_LIBRARIES ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_Fortran_LIBRARIES} ${HDF5_LIBRARIES})
 list(APPEND HDF5_INCLUDE_DIRS ${HDF5_Fortran_INCLUDE_DIRS})
 
-if(NOT DEFINED HDF5OK)
+if(DEFINED HDF5OK)
+  return()
+endif()
 
 message(STATUS "HDF5 include: ${HDF5_INCLUDE_DIRS}")
-
 message(STATUS "HDF5 library: ${HDF5_LIBRARIES}")
 if(HDF5_Fortran_COMPILER_EXECUTABLE)
   message(STATUS "HDF5 Fortran compiler: ${HDF5_Fortran_COMPILER_EXECUTABLE}")
 endif()
 if(HDF5_Fortran_DEFINITIONS)
   message(STATUS "HDF5 compiler defs: ${HDF5_Fortran_DEFINITIONS}")
 endif()
-endif()
 
 set(CMAKE_REQUIRED_INCLUDES ${HDF5_INCLUDE_DIRS})
 set(CMAKE_REQUIRED_LIBRARIES ${HDF5_LIBRARIES})
@@ -35,8 +41,6 @@ include(CheckFortranSourceCompiles)
 file(READ ${CMAKE_SOURCE_DIR}/src/tests/test_minimal.f90 _code)
 check_fortran_source_compiles(${_code} HDF5OK SRC_EXT f90)
 
-set(HDF5OK ${HDF5OK} CACHE BOOL "HDF5 library working?")
-
 if(NOT HDF5OK)
-  message(WARNING "HDF5 library may not be working with ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION}")
-endif()
+  message(FATAL_ERROR "HDF5 library not working with ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION}")
+endif(NOT HDF5OK)

meson.build

@@ -1,6 +1,6 @@
 project('h5fortran', 'fortran',
   meson_version : '>=0.52.0',
-  version : '2.3.0',
+  version : '2.3.1',
   default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
 
 subdir('meson')

src/tests/test_hdf5_ifc.f90

@@ -294,7 +294,6 @@ subroutine test_string_rw(path)
 character(2) :: value
 character(1024) :: val1k
 character(:), allocatable :: final
-integer :: i
 
 call h5f%initialize(path//'/test_string.h5', ierr, status='new', action='rw')
 call h5f%write('/little', '42', ierr)

src/tests/test_shape.f90

@@ -5,7 +5,7 @@
 
 type(hdf5_file) :: h5f
 character(1024) :: argv
-character(:), allocatable :: fn, dname, cmd
+character(:), allocatable :: fn, dname
 integer(HSIZE_T), allocatable :: dims(:)
 integer :: ierr
 logical :: exists

src/write.f90

@@ -76,7 +76,6 @@
   !! sentinel value for unused property
 endif
 
-print *, dname, size(dims)
 if(exists) return
 
 if(size(dims) == 0) then

src/writer.f90

@@ -9,7 +9,8 @@
 module procedure hdf_write_scalar
 
 integer(HID_T)  :: dtype
-integer(HSIZE_T) :: dims(rank(value))
+integer(HSIZE_T), allocatable :: dims(:)
+allocate(dims(0))
 
 select type (value)
 type is (character(*))
@@ -18,25 +19,21 @@
   return
 type is (real(real64))
   dtype = h5kind_to_type(kind(value),H5_REAL_KIND)
-  dims = shape(value)
   call hdf_setup_write(self,dname,dtype,dims, ierr)
   if (ierr /= 0) return
   call h5dwrite_f(self%did, dtype, value, dims, ierr)
 type is (real(real32))
   dtype = h5kind_to_type(kind(value),H5_REAL_KIND)
-  dims = shape(value)
   call hdf_setup_write(self,dname,dtype,dims, ierr)
   if (ierr /= 0) return
   call h5dwrite_f(self%did, dtype, value, dims, ierr)
 type is (integer(int32))
   dtype = h5kind_to_type(kind(value),H5_INTEGER_KIND)
-  dims = shape(value)
   call hdf_setup_write(self,dname,dtype,dims, ierr)
   if (ierr /= 0) return
   call h5dwrite_f(self%did, dtype, value, dims, ierr)
 type is (integer(int64))
   dtype = h5kind_to_type(kind(value),H5_INTEGER_KIND)
-  dims = shape(value)
   call hdf_setup_write(self,dname,dtype,dims, ierr)
   if (ierr /= 0) return
   call h5dwrite_f(self%did, dtype, value, dims, ierr)