meson: default homebrew for mac

Author: scivision

.github/workflows/ci.yml

@@ -10,17 +10,13 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-python@v1
       with:
-        python-version: 3.7
-    - name: Install Meson
-      run: python -m pip install meson
-    - name: Install packages
-      run: sudo apt install -yq --no-install-recommends ninja-build gfortran libhdf5-dev
-    - name: Meson configure
-      run: meson setup build
+        python-version: '3.x'
+    - run: python -m pip install meson
+    - run: sudo apt install -yq --no-install-recommends ninja-build gfortran libhdf5-dev
+    - run: meson setup build
       env:
         FC: gfortran
-    - name: Meson test
-      run: meson test -C build -v
+    - run: meson test -C build -v
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
@@ -31,17 +27,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Install packages
-      run: sudo apt install -yq --no-install-recommends gfortran libhdf5-dev
-    - name: Cmake configure
-      run: |
+    - run: sudo apt install -yq --no-install-recommends gfortran libhdf5-dev
+    - run: |
         mkdir build
         cd build
         cmake ..
       env:
         FC: gfortran
-    - name: Cmake build
-      run: cmake --build build --parallel
-    - name: Cmake test
-      run: ctest -V
+    - run: cmake --build build --parallel
+    - run: ctest -V
       working-directory: build

.github/workflows/ci_mac.yml

@@ -0,0 +1,39 @@
+name: ci_mac
+
+on: [push, pull_request]
+
+jobs:
+
+  macMeson:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-python@v1
+      with:
+        python-version: '3.x'
+    - run: python -m pip install meson
+    - run: brew install ninja gcc hdf5
+    - run: meson setup build
+      env:
+        FC: gfortran-9
+        CC: gcc-9
+    - run: meson test -C build -v
+    - uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: Mac_Meson_Testlog
+        path: build/meson-logs/testlog.txt
+
+  macCmake:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Install packages
+      run: brew install gcc hdf5
+    - run: cmake -B build
+      env:
+        FC: gfortran-9
+        CC: gcc-9
+    - run: cmake --build build --parallel
+    - run: ctest -V
+      working-directory: build

README.md

@@ -1,7 +1,7 @@
 [![DOI](https://zenodo.org/badge/128736984.svg)](https://zenodo.org/badge/latestdoi/128736984)
 
 [![Actions Status](https://github.com/scivision/oo_hdf5_fortran/workflows/ci/badge.svg)](https://github.com/scivision/oo_hdf5_fortran/actions)
-
+[![Actions Status](https://github.com/scivision/oo_hdf5_fortran/workflows/ci_mac/badge.svg)](https://github.com/scivision/oo_hdf5_fortran/actions)
 
 # Object-oriented Fortran 2018 HDF5 interface
 
@@ -31,7 +31,7 @@ Requirements:
 
 * modern Fortran 2008 compiler
 * HDF5 Fortran library (1.8 or 1.10)
-  * Mac: `brew install gcc hdf5`
+  * Mac / Homebrew: `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`

cmake/meson.build

@@ -1,6 +1,8 @@
 quiet = ['-w']
 
 fc = meson.get_compiler('fortran')
+os = target_machine.system()
+
 f18flag = fc.first_supported_argument(['-std=f2018', '-stand f18', '/stand:f18'])
 if fc.get_id() == 'gcc'
   add_project_arguments('-fimplicit-none', f18flag, language : 'fortran')
@@ -14,30 +16,40 @@ elif fcid == 'pgi'
 endif
 
 
-hdf5 = dependency('hdf5', language : 'fortran', required: false)
-h5incdir = []
-if not hdf5.found()
-  h5libdir = get_option('h5libdir')
-  if h5libdir == ''
+hdf5 = dependency('hdf5', language : 'fortran', required: false, disabler: true)
+if fc.links('use h5lt; end', dependencies: hdf5, name: 'HDF5')
+  subdir_done()
+endif
+
+# HDF5 was not found
+h5incdir = include_directories(get_option('h5incdir'))
+h5libdir = get_option('h5libdir')
+if h5libdir == ''
+  if os == 'darwin'
+    # assume homebrew
+    h5libdir = '/usr/local/opt/hdf5/lib'
+    h5incdir = include_directories('/usr/local/opt/hdf5/include')
+  else
     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_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
-  # hdf5 = declare_dependency(dependencies: hdf5_libs, include_directories: h5incdir)  # meson bug?
-  hdf5 = hdf5_libs
+endforeach
+
+if hdf5_libs.length() == 0
+  error('could not find HDF5 library')
 endif
-h5run = fc.run('use h5lt; end', dependencies: hdf5, include_directories: h5incdir, name: 'HDF5 runs')
-if h5run.returncode() != 0
+
+hdf5 = hdf5_libs
+
+if not fc.links('use h5lt; end', dependencies: hdf5, include_directories: h5incdir, name: 'HDF5')
   warning('HDF5 possible linking problems: ' +  h5run.stdout() + h5run.stderr())
-endif
+endif

meson.build

@@ -6,11 +6,12 @@ project('Object-oriented HDF5 Fortran', 'fortran',
 subdir('cmake')
 
 subdir('src')
+
 ooh5 = library('oohdf5',
   sources: hdf5_src,
   dependencies: hdf5,
-  include_directories: h5incdir
-)
+  include_directories: h5incdir,
+  install: true)
 
 # --- testing
 subdir('tests')
@@ -19,4 +20,7 @@ shapes = executable('shapes_hdf5', 'tests/GetShape.f90',
   dependencies: hdf5,
   link_with: ooh5,
   fortran_args: quiet)
-test('Shapes', shapes, args: ['p5.h5','group69/flux_node'], is_parallel: false)
+test('Shapes', shapes,
+  args: ['p5.h5','group69/flux_node'],
+  is_parallel: false,
+  timeout: 30)