diff options
| author | Benjamin Redelings <benjamin.redelings@gmail.com> | 2018-02-08 08:44:05 -0500 |
|---|---|---|
| committer | Benjamin Redelings <benjamin.redelings@gmail.com> | 2018-02-08 08:44:05 -0500 |
| commit | 8596c36214cdac61ef0fd25b6b68d73f7f834db8 (patch) | |
| tree | bc4f9664bf5cccd04db8bb75aebfb5c64fbe626b | |
| parent | 80e4ac2d49f6b00e09c58dae83a6cbeb1ad2b082 (diff) | |
| download | meson-8596c36214cdac61ef0fd25b6b68d73f7f834db8.zip meson-8596c36214cdac61ef0fd25b6b68d73f7f834db8.tar.gz meson-8596c36214cdac61ef0fd25b6b68d73f7f834db8.tar.bz2 | |
Don't give up - boost could be in search path.
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 6d13d98..e2f735f 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -139,10 +139,6 @@ class BoostDependency(ExternalDependency): else: self.incdir = self.detect_nix_incdir() - if self.incdir is None and mesonlib.for_windows(self.want_cross, self.env): - self.log_fail() - return - if self.check_invalid_modules(): self.log_fail() return @@ -150,8 +146,10 @@ class BoostDependency(ExternalDependency): mlog.debug('Boost library root dir is', mlog.bold(self.boost_root)) mlog.debug('Boost include directory is', mlog.bold(self.incdir)) - self.lib_modules = {} + # This checks if we can find BOOST headers. self.detect_version() + + self.lib_modules = {} if self.is_found: self.detect_lib_modules() mlog.debug('Boost library directory is', mlog.bold(self.libdir)) |