Merge pull request #2803 from dcbaker/wip/freebsd-fixes

various BSD fixes

5 files changed, 33 insertions, 16 deletions

diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build
index 521100694..549adce90 100644
--- a/test cases/frameworks/15 llvm/meson.build
+++ b/test cases/frameworks/15 llvm/meson.build
@@ -20,17 +20,19 @@ foreach static : [true, false]
     'llvm',
     modules : ['bitwriter', 'asmprinter', 'executionengine', 'target',
                'mcjit', 'nativecodegen'],
-    required : true,
+    required : false,
     static : static,
   )
-  name = static ? 'static' : 'dynamic'
-  executable(
-    'sum-@0@'.format(name),
-    'sum.c',
-    dependencies : [
-      llvm_dep, dep_tinfo,
-      dependency('zlib'),
-      meson.get_compiler('c').find_library('dl', required : false),
-    ]
-  )
+  if llvm_dep.found()
+    name = static ? 'static' : 'dynamic'
+    executable(
+      'sum-@0@'.format(name),
+      'sum.c',
+      dependencies : [
+        llvm_dep, dep_tinfo,
+        dependency('zlib'),
+        meson.get_compiler('c').find_library('dl', required : false),
+      ]
+    )
+  endif
 endforeach
diff --git a/test cases/frameworks/17 mpi/meson.build b/test cases/frameworks/17 mpi/meson.build
index 17acd713d..01ad61dc5 100644
--- a/test cases/frameworks/17 mpi/meson.build
+++ b/test cases/frameworks/17 mpi/meson.build
@@ -6,7 +6,10 @@ if build_machine.system() == 'windows' and cc.get_id() != 'msvc'
   error('MESON_SKIP_TEST: MPI not available on Windows without MSVC.')
 endif
 
-mpic = dependency('mpi', language : 'c')
+mpic = dependency('mpi', language : 'c', required : false)
+if not mpic.found()
+  error('MESON_SKIP_TEST: MPI not found, skipping.')
+endif
 exec = executable('exec',
   'main.c',
   dependencies : [mpic])
diff --git a/test cases/frameworks/18 vulkan/meson.build b/test cases/frameworks/18 vulkan/meson.build
index 54f1d4746..e98854ebe 100644
--- a/test cases/frameworks/18 vulkan/meson.build
+++ b/test cases/frameworks/18 vulkan/meson.build
@@ -1,6 +1,9 @@
 project('vulkan test', 'c')
 
-vulkan_dep = dependency('vulkan')
+vulkan_dep = dependency('vulkan', required : false)
+if not vulkan_dep.found()
+  error('MESON_SKIP_TEST: vulkan not found.')
+endif
 
 e = executable('vulkanprog', 'vulkanprog.c', dependencies : vulkan_dep)
 
diff --git a/test cases/frameworks/2 gtest/meson.build b/test cases/frameworks/2 gtest/meson.build
index 419f451b7..e5418e963 100644
--- a/test cases/frameworks/2 gtest/meson.build
+++ b/test cases/frameworks/2 gtest/meson.build
@@ -1,6 +1,9 @@
 project('gtest', 'cpp')
 
-gtest = dependency('gtest', main : true)
+gtest = dependency('gtest', main : true, required : false)
+if not gtest.found()
+  error('MESON_SKIP_TEST: gtest not installed.')
+endif
 gtest_nomain = dependency('gtest', main : false)
 
 e = executable('testprog', 'test.cc', dependencies : gtest)
diff --git a/test cases/frameworks/3 gmock/meson.build b/test cases/frameworks/3 gmock/meson.build
index 341f9d749..516547fc7 100644
--- a/test cases/frameworks/3 gmock/meson.build
+++ b/test cases/frameworks/3 gmock/meson.build
@@ -3,8 +3,14 @@ project('gmock test', 'cpp')
 # Using gmock without gtest is a pain so just
 # don't support that then.
 
-gtest = dependency('gtest', main : true)
-gmock = dependency('gmock')
+gtest = dependency('gtest', main : true, required : false)
+if not gtest.found()
+  error('MESON_SKIP_TEST: gtest not installed.')
+endif
+gmock = dependency('gmock', required : false)
+if not gmock.found()
+  error('MESON_SKIP_TEST: gmock not installed.')
+endif
 
 e = executable('gmocktest', 'gmocktest.cc', dependencies : [gtest, gmock])
 test('gmock test', e)