aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/dependencies')
-rw-r--r--mesonbuild/dependencies/base.py3
-rw-r--r--mesonbuild/dependencies/misc.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index f4ecd57..139ff39 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -547,6 +547,7 @@ class ExtraFrameworkDependency(Dependency):
def __init__(self, name, required, path, kwargs):
Dependency.__init__(self, 'extraframeworks', kwargs)
self.name = None
+ self.required = required
self.detect(name, path)
if self.found():
mlog.log('Dependency', mlog.bold(name), 'found:', mlog.green('YES'),
@@ -570,6 +571,8 @@ class ExtraFrameworkDependency(Dependency):
self.path = p
self.name = d
return
+ if not self.found() and self.required:
+ raise DependencyException('Framework dependency %s not found.' % (name, ))
def get_compile_args(self):
if self.found():
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 3374c6e..e997807 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -95,7 +95,6 @@ class BoostDependency(Dependency):
def get_compile_args(self):
args = []
- include_dir = ''
if self.boost_root is not None:
if mesonlib.is_windows():
include_dir = self.boost_root