MSYS2 works OK

better search

init

unused []

Author: scivision

.travis.yml

@@ -34,4 +34,4 @@ before_install:
 
 install: meson build
 
-script: meson test -C build
+script: meson test -C build -v

README.md

@@ -6,7 +6,7 @@
 # Object-oriented Fortran 2018 HDF5 interface
 
 Straightforward single-file/module access to HDF5.
-Uses Fortran 2008 `submodule` for clean, templatable structure.
+Uses Fortran 2008 `submodule` for clean template structure.
 This thin object-oriented modern Fortran library abstracts away the messy parts of HDF5 so that you can read/write various types/ranks of data with a single command.
 
 Polymorphic API with read/write for types integer, real32, real64 with rank:
@@ -21,23 +21,24 @@ Tested on systems with HDF5 1.8 and 1.10 including:
 * MacOS (homebrew)
 * Ubuntu 16.04 / 18.04 (gfortran 6 or newer)
 * Windows Subsystem for Linux.
+* Windows MSYS2
 
-Note: Currently, Cygwin does not have Fortran HDF5 libraries.
+Currently, Cygwin does not have *Fortran* HDF5 libraries.
 
 ## Build
 
 Requirements:
 
-* modern Fortran 2008 compiler (such as gfortran ≥ 5.4.1, etc.)
+* modern Fortran 2008 compiler
 * HDF5 Fortran library (1.8 or 1.10)
   * Mac: `brew install gcc hdf5`
   * Linux: `apt install gfortran libhdf5-dev`
   * Windows Subsystem for Linux: `apt install gfortran libhdf5-dev`
+  * Windows MSYS2: `pacman -S mingw-w64-x86_64-hdf5`
 
 Note that some precompiled HDF5 libraries include C / C++ without Fortran.
-We have included a test in the build system to ensure that HDF5 links in Fortran before trying to buidl the OOHDF5 library.
 
-Build this HDF5 OO Fortran interface with other Meson or CMake.
+Build this HDF5 OO Fortran interface with Meson or CMake.
 The library `libh5oo` is built, link it into your program as usual.
 
 ### Meson
@@ -48,6 +49,17 @@ meson build
 meson test -C build
 ```
 
+If HDF5 isn't found, you may need to specify on the command line:
+
+* `-Dh5libdir`: HDF5 library directory
+* `-Dh5incdir`: HDF5 include directory
+
+For MSYS2 this might be like:
+
+```posh
+meson build -Dh5libdir=c:/msys64/mingw64/lib -Dh5incdir=c:/msys64/mingw64/include/static
+```
+
 ### CMake
 
 ```sh
@@ -63,7 +75,8 @@ cd build
 ctest -V
 ```
 
-If you need to specify a particular HDF5 library, use
+To specify a particular HDF5 library, use
+
 ```sh
 cmake -DHDF5_ROOT=/path/to/hdf5lib -B build
 ```

build/.ignore

@@ -1,11 +1,27 @@
 find_package(HDF5 REQUIRED COMPONENTS Fortran Fortran_HL)
 
+if(WIN32)
+  # Needed for MSYS2, this directory wasn't in CMake 3.15.2 FindHDF5
+  if(EXISTS ${HDF5_INCLUDE_DIRS}/static)
+    list(APPEND HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS}/static)
+  endif()
+endif()
+
+message(STATUS "HDF5 includes: ${HDF5_INCLUDE_DIRS} ${HDF5_Fortran_INCLUDE_DIRS}")
+message(STATUS "HDF5 library: ${HDF5_Fortran_LIBRARIES}   H5LT library: ${HDF5_Fortran_HL_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()
+
 set(CMAKE_REQUIRED_INCLUDES ${HDF5_INCLUDE_DIRS} ${HDF5_Fortran_INCLUDE_DIRS})
 set(CMAKE_REQUIRED_LIBRARIES ${HDF5_Fortran_LIBRARIES} ${HDF5_Fortran_HL_LIBRARIES})
 
 include(CheckFortranSourceCompiles)
 check_fortran_source_compiles("use h5lt; end" hasHDF5 SRC_EXT f90)
 
 if(NOT hasHDF5)
-  message(FATAL_ERROR "HDF5 library not working with ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION}")
+  message(WARNING "HDF5 library may not be working with ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION}")
 endif()

cmake/hdf5.cmake

@@ -0,0 +1,43 @@
+quiet = ['-w']
+
+fc = meson.get_compiler('fortran')
+f18flag = fc.first_supported_argument(['-std=f2018', '-stand f18', '/stand:f18'])
+if fc.get_id() == 'gcc'
+  add_project_arguments('-fimplicit-none', f18flag, language : 'fortran')
+  quiet = ['-Wno-compare-reals', '-Wno-maybe-uninitialized']
+elif fcid == 'intel'
+  add_project_arguments('-warn', '-heap-arrays', f18flag, language : 'fortran')
+elif fcid == 'intel-cl'
+  add_project_arguments('/warn', '/heap-arrays', f18flag, language : 'fortran')
+elif fcid == 'pgi'
+  add_project_arguments('-C', '-Mdclchk', language : 'fortran')
+endif
+
+
+hdf5 = dependency('hdf5', language : 'fortran', required: false)
+h5incdir = []
+if not hdf5.found()
+  h5libdir = get_option('h5libdir')
+  if h5libdir == ''
+    h5libdir = []
+  endif
+  h5incdir = include_directories(get_option('h5incdir'))
+  hdf5_libs = []
+  foreach name : ['hdf5', 'hdf5_fortran', 'hdf5_hl', 'hdf5_hl_fortran', # msys2 names
+                  'hdf5_serial', 'hdf5_serial_fortran',
+                  'hdf5_serial_hl', 'hdf5_serialhl_fortran']
+    lib = fc.find_library(name, required: false, dirs: h5libdir)
+    if lib.found()
+      hdf5_libs += lib
+    endif
+  endforeach
+  if hdf5_libs.length() == 0
+    error('could not find HDF5 library')
+  endif
+  # hdf5 = declare_dependency(dependencies: hdf5_libs, include_directories: h5incdir)  # meson bug?
+  hdf5 = hdf5_libs
+endif
+h5run = fc.run('use h5lt; end', dependencies: hdf5, include_directories: h5incdir, name: 'HDF5 runs')
+if h5run.returncode() != 0
+  warning('HDF5 possible linking problems: ' +  h5run.stdout() + h5run.stderr())
+endif

cmake/meson.build

@@ -1,35 +1,15 @@
 project('Object-oriented HDF5 Fortran', 'fortran',
   meson_version : '>=0.51.2',
-  version : '1.0.0')
+  version : '1.0.0',
+  default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
 
-quiet = ['-w']
-
-fc = meson.get_compiler('fortran')
-if fc.get_id() == 'gcc'
-  add_project_arguments('-O', '-fimplicit-none', '-Wextra', '-Wpedantic', language : 'fortran')
-  quiet = ['-Wno-compare-reals', '-Wno-maybe-uninitialized']
-  if fc.version().version_compare('>=8')
-    add_project_arguments('-std=f2018', language : 'fortran')
-  endif
-elif fcid == 'intel'
-  add_project_arguments('-warn', '-heap-arrays', '-stand f18', language : 'fortran')
-elif fcid == 'intel-cl'
-  add_project_arguments('/warn', '/heap-arrays', '/stand:f18', language : 'fortran')
-elif fcid == 'pgi'
-  add_project_arguments('-C', '-Mdclchk', language : 'fortran')
-endif
-
-hdf5 = dependency('hdf5', language : 'fortran')
-
-h5run = fc.run('use h5lt; end', dependencies: hdf5, name: 'HDF5')
-if h5run.returncode() != 0
-  error('HDF5 linking problems: ' + h5run.stderr())
-endif
+subdir('cmake')
 
 subdir('src')
 ooh5 = library('oohdf5',
   sources: hdf5_src,
-  dependencies: hdf5
+  dependencies: hdf5,
+  include_directories: h5incdir
 )
 
 # --- testing

meson.build

@@ -0,0 +1,2 @@
+option('h5libdir', type : 'string', description : 'HDF5 library directory', yield: true)
+option('h5incdir', type : 'string', description : 'HDF5 include directory', yield: true)