3 files changed, 19 insertions, 12 deletions
diff --git a/test cases/frameworks/25 hdf5/main.c b/test cases/frameworks/25 hdf5/main.c
index 8773e49..4c46310 100644
--- a/test cases/frameworks/25 hdf5/main.c
+++ b/test cases/frameworks/25 hdf5/main.c
@@ -6,9 +6,7 @@
 int main(void)
 {
 herr_t ier;
-unsigned maj;
-unsigned min;
-unsigned rel;
+unsigned maj, min, rel;
 
 ier = H5open();
 if (ier) {
diff --git a/test cases/frameworks/25 hdf5/main.cpp b/test cases/frameworks/25 hdf5/main.cpp
index 1d53e76..2baff36 100644
--- a/test cases/frameworks/25 hdf5/main.cpp
+++ b/test cases/frameworks/25 hdf5/main.cpp
@@ -5,9 +5,7 @@
 int main(void)
 {
 herr_t ier;
-unsigned maj;
-unsigned min;
-unsigned rel;
+unsigned maj, min, rel;
 
 ier = H5open();
 if (ier) {
diff --git a/test cases/frameworks/25 hdf5/meson.build b/test cases/frameworks/25 hdf5/meson.build
index 94505a8..e225a35 100644
--- a/test cases/frameworks/25 hdf5/meson.build
+++ b/test cases/frameworks/25 hdf5/meson.build
@@ -1,4 +1,12 @@
-project('hdf5_test', 'c', 'cpp', 'fortran')
+project('hdf5_test', 'c', 'cpp')
+
+if build_machine.system() == 'darwin'
+  error('MESON_SKIP_TEST: HDF5 CI image not setup for OSX.')
+endif
+
+if build_machine.system() == 'cygwin'
+  error('MESON_SKIP_TEST: HDF5 CI image not setup for Cygwin.')
+endif
 
 
 # --- C tests
@@ -20,12 +28,15 @@ test('HDF5 C++', execpp)
 
 
 # --- Fortran tests
-h5f = dependency('hdf5', language : 'fortran')
-exef = executable('exef', 'main.f90',
-  dependencies : h5f)
-  
-test('HDF5 Fortran', exef)
+if build_machine.system() != 'windows'
+  add_languages('fortran')
+
+  h5f = dependency('hdf5', language : 'fortran')
+  exef = executable('exef', 'main.f90',
+    dependencies : h5f)
 
+  test('HDF5 Fortran', exef)
+endif
 
 # Check we can apply a version constraint
 if h5c.version() != 'unknown'