workarounds for Intel 2020 compiler

geospace-code · Feb 24, 2020 · b123602 · b123602
1 parent 4caf8e5
commit b123602
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 project(h5fortran
   LANGUAGES C Fortran
-  VERSION 2.6.2
+  VERSION 2.6.3
   DESCRIPTION "thin, light, easy HDF5 Fortran interface"
   HOMEPAGE_URL https://github.com/scivision/h5fortran)
 enable_testing()

diff --git a/cmake/hdf5.cmake b/cmake/hdf5.cmake
@@ -5,6 +5,14 @@ set(HDF5_USE_STATIC_LIBRARIES true)
 if(WIN32 AND CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
   set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE true)
   set(HDF5_USE_STATIC_LIBRARIES false)
+
+  if(NOT HDF5_ROOT)
+    # help CMake find binary HDF5
+    file(GLOB _h5guess "c:/Program Files/HDF_Group/HDF5/1.1*/")
+    if(EXISTS ${_h5guess})
+      set(HDF5_ROOT ${_h5guess})
+    endif()
+  endif()
 endif()
 
 find_package(HDF5 COMPONENTS Fortran HL)

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('h5fortran', 'fortran',
   meson_version : '>=0.52.0',
-  version : '2.6.2',
+  version : '2.6.3',
   default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
 
 subdir('meson')

diff --git a/src/interface.f90 b/src/interface.f90
@@ -14,6 +14,9 @@ module h5fortran
 public :: hdf5_file, toLower, hdf_shape_check, hsize_t, strip_trailing_null, truncate_string_null, &
   check, h5write, h5read
 
+!> Workaround for Intel 19.1 / 2020 bug with /stand:f18
+!> error #6410: This name has not been declared as an array or a function.   [RANK]
+intrinsic :: rank
 
 !> main type
 type :: hdf5_file