meson: bugfix and backport from dev

Author: scivision

.github/workflows/ci_linux.yml

@@ -2,11 +2,11 @@ name: ci_linux
 
 on:
   push:
-    paths-ignore:
-      - "**/*.md"
+    paths:
+      - "**.f90"
   pull_request:
-    paths-ignore:
-      - "**/*.md"
+    paths:
+      - "**.f90"
 
 jobs:
 
@@ -17,8 +17,8 @@ jobs:
     - uses: actions/setup-python@v1
       with:
         python-version: '3.x'
-    - run: python -m pip install meson
-    - run: sudo apt install -yq --no-install-recommends ninja-build gfortran libhdf5-dev
+    - run: python -m pip install meson ninja
+    - run: sudo apt install -yq --no-install-recommends gfortran libhdf5-dev
     - run: meson setup build --default-library=static
       env:
         FC: gfortran
@@ -36,8 +36,8 @@ jobs:
     - uses: actions/setup-python@v1
       with:
         python-version: '3.x'
-    - run: python -m pip install meson
-    - run: sudo apt install -yq --no-install-recommends ninja-build gfortran libhdf5-dev
+    - run: python -m pip install meson ninja
+    - run: sudo apt install -yq --no-install-recommends gfortran libhdf5-dev
     - run: meson setup build --default-library=shared
       env:
         FC: gfortran

.github/workflows/ci_mac.yml

@@ -2,11 +2,11 @@ name: ci_mac
 
 on:
   push:
-    paths-ignore:
-      - "**/*.md"
+    paths:
+      - "**.f90"
   pull_request:
-    paths-ignore:
-      - "**/*.md"
+    paths:
+      - "**.f90"
 
 jobs:
 
@@ -17,8 +17,8 @@ jobs:
     - uses: actions/setup-python@v1
       with:
         python-version: '3.x'
-    - run: python -m pip install meson
-    - run: brew install ninja pkg-config gcc hdf5
+    - run: python -m pip install meson ninja
+    - run: brew install pkg-config gcc hdf5
     - run: meson setup build --default-library=shared
       env:
         FC: gfortran-9

CMakeLists.txt

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

README.md

@@ -40,7 +40,7 @@ Requirements:
 Note that some precompiled HDF5 libraries include C / C++ without Fortran.
 
 Build this HDF5 OO Fortran interface with Meson or CMake.
-The library `libh5oo` is built, link it into your program as usual.
+The library `libh5fortran` is built, link it into your program as usual.
 
 ### Meson
 
@@ -52,8 +52,8 @@ 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
+* `-Dhdf5_libdir`: HDF5 library directory
+* `-Dhdf5_incdir`: HDF5 include directory
 
 To include h5fortran as a Meson subproject, in the master project meson.build (that uses h5fortran) have like:
 

meson.build

@@ -1,13 +1,13 @@
-project('Object-oriented HDF5 Fortran', 'fortran',
+project('h5fortran', 'fortran',
   meson_version : '>=0.51.2',
-  version : '1.3.0',
+  version : '1.3.1',
   default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
 
-subdir('cmake')
+subdir('meson')
 
 subdir('src')
 
-ooh5 = library('oohdf5',
+ooh5 = library('h5fortran',
   sources: hdf5_src,
   dependencies: hdf5,
   install: true)

cmake/meson.build renamed to meson/meson.build

@@ -7,64 +7,75 @@ 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'
+elif fc.get_id() == 'intel'
   add_project_arguments('-warn', '-heap-arrays', f18flag, language : 'fortran')
-elif fcid == 'intel-cl'
+elif fc.get_id() == 'intel-cl'
   add_project_arguments('/warn', '/heap-arrays', f18flag, language : 'fortran')
-elif fcid == 'pgi'
+elif fc.get_id() == 'pgi'
   add_project_arguments('-C', '-Mdclchk', language : 'fortran')
 endif
 
 #== find HDF5
 
 # needed for HDF5 on some systems including Ubuntu
+# these are moving to glibc so eventually this goes away
+# https://github.com/mesonbuild/meson/issues/4297#issuecomment-425744841
 threads = dependency('threads', required: false)
 dl = fc.find_library('dl', required: false)
 
 use_static = get_option('default_library') == 'static'
 # NOTE: static: parameter is too strict for now. Works more reliably without this parameter
 
 hdf5 = dependency('hdf5', language : 'fortran', required: false, disabler: true)  # , static: use_static
+hdf5 = [hdf5]
+if threads.found()
+  hdf5 += threads
+endif
+if dl.found()
+  hdf5 += dl
+endif
 if fc.links('use h5lt; end', dependencies: hdf5, name: 'HDF5')
-  h5incdir = []
-  hdf5 = [hdf5, threads, dl]
+  hdf5_incdir = []
   subdir_done()
 endif
 
 # HDF5 was not found
-h5incdir = include_directories(get_option('h5incdir'))
-h5libdir = get_option('h5libdir')
-if h5libdir == ''
+hdf5_incdir = include_directories(get_option('hdf5_incdir'))
+hdf5_libdir = get_option('hdf5_libdir')
+if hdf5_libdir == ''
   if os == 'darwin'
     # assume homebrew
-    h5libdir = '/usr/local/opt/hdf5/lib'
-    h5incdir = include_directories('/usr/local/opt/hdf5/include')
+    hdf5_libdir = '/usr/local/opt/hdf5/lib'
+    hdf5_incdir = include_directories('/usr/local/opt/hdf5/include')
   elif os == 'windows'
     # assume MSYS2
-    h5libdir = 'c:/msys64/mingw64/lib'
+    hdf5_libdir = 'c:/msys64/mingw64/lib'
     if use_static
-      h5incdir = include_directories('c:/msys64/mingw64/include/static')
+      hdf5_incdir = include_directories('c:/msys64/mingw64/include/static')
     else
-      h5incdir = include_directories('c:/msys64/mingw64/include/shared')
+      hdf5_incdir = include_directories('c:/msys64/mingw64/include/shared')
     endif
   else
-    h5libdir = []
+    hdf5_libdir = []
   endif
 endif
 
 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)  # , static: use_static
+  lib = fc.find_library(name, required: false, dirs: hdf5_libdir)  # , static: use_static
   if lib.found()
     hdf5_libs += lib
   endif
 endforeach
 
 
-if not fc.links('use h5lt; end', dependencies: hdf5_libs, include_directories: h5incdir, name: 'HDF5')
-  hdf5 = disabler()
+if fc.links('use h5lt; end', dependencies: hdf5_libs,
+            include_directories: hdf5_incdir,
+            name: 'HDF5')
+  hdf5 = declare_dependency(dependencies: [hdf5_libs, threads, dl],
+                            include_directories: hdf5_incdir)
 else
-  hdf5 = declare_dependency(dependencies: [hdf5_libs, threads, dl], include_directories: h5incdir)
+  hdf5 = disabler()
 endif

meson_options.txt

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

requirements.txt

@@ -1 +1,2 @@
-meson
+meson
+ninja