diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-10 13:04:00 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-10 18:55:50 +0530 |
commit | 9308a6d923ecdfabb40d88e1590226172ea95e43 (patch) | |
tree | 26ffa6a115fcacb1ee0741c6d946f8a43d6abbbb /mesonbuild/dependencies/misc.py | |
parent | c1e9c757ebbe7a26b126ee8cb2106f6f8dffa322 (diff) | |
download | meson-9308a6d923ecdfabb40d88e1590226172ea95e43.zip meson-9308a6d923ecdfabb40d88e1590226172ea95e43.tar.gz meson-9308a6d923ecdfabb40d88e1590226172ea95e43.tar.bz2 |
tests: Add Boost unit tests and project tests on Windows
Boost tests are disabled on Windows for now because the detection
is actually completely broken. Once that's fixed (after the release)
we can enable it again.
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
-rw-r--r-- | mesonbuild/dependencies/misc.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 1356ec8..c24acf0 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -126,8 +126,8 @@ class BoostDependency(ExternalDependency): def get_requested(self, kwargs): candidates = kwargs.get('modules', []) - if isinstance(candidates, str): - return [candidates] + if not isinstance(candidates, list): + candidates = [candidates] for c in candidates: if not isinstance(c, str): raise DependencyException('Boost module argument is not a string.') @@ -136,7 +136,8 @@ class BoostDependency(ExternalDependency): def validate_requested(self): for m in self.requested_modules: if m not in self.src_modules: - raise DependencyException('Requested Boost module "%s" not found.' % m) + msg = 'Requested Boost module {!r} not found' + raise DependencyException(msg.format(m)) def detect_version(self): try: |