diff options
| author | MichaĆ WikliĆski <mail@sirmike.org> | 2017-08-19 03:13:29 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-20 23:17:12 +0300 |
| commit | 9154a6473b28f4cb60d23a7bc15ab8b1d223c1bb (patch) | |
| tree | 0464fbf4f0a16dd104ca69fb7693a8244aa3abe8 /mesonbuild/dependencies/misc.py | |
| parent | 24ff7da0d2a5dabbe17f5e9c648ef1ef6e2232aa (diff) | |
| download | meson-9154a6473b28f4cb60d23a7bc15ab8b1d223c1bb.zip meson-9154a6473b28f4cb60d23a7bc15ab8b1d223c1bb.tar.gz meson-9154a6473b28f4cb60d23a7bc15ab8b1d223c1bb.tar.bz2 | |
Find Boost dep when there is an extra lib to link
There are several components in Boost which must be linked with extra
libraries. Boost Log is one of them and in special circumstances needs
linking with boost_log_setup.
http://www.boost.org/doc/libs/1_64_0/libs/log/doc/html/log/detailed/utilities.html#log.detailed.utilities.setup
This fix covers the case when there is no source file corresponding to
the additional library.
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index e9effc6..0112fd3 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -142,7 +142,7 @@ class BoostDependency(ExternalDependency): def validate_requested(self): for m in self.requested_modules: - if m not in self.src_modules: + if m not in self.src_modules and m not in self.lib_modules and m + '-mt' not in self.lib_modules_mt: msg = 'Requested Boost module {!r} not found' raise DependencyException(msg.format(m)) |