diff options
| author | Niklas Claesson <nicke.claesson@gmail.com> | 2017-10-09 14:55:54 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-12 21:45:23 +0300 |
| commit | c97e7749a67d373fda57752fac955ec691886231 (patch) | |
| tree | 1787435c4a085cad1339ab1596983739787e8819 | |
| parent | 756e682f2a628395c610efe01813a2c6fabe3e7f (diff) | |
| download | meson-c97e7749a67d373fda57752fac955ec691886231.zip meson-c97e7749a67d373fda57752fac955ec691886231.tar.gz meson-c97e7749a67d373fda57752fac955ec691886231.tar.bz2 | |
Boost: Jamfile has two syntaxes for boost libraries
Fixes #2456
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 1 | ||||
| -rwxr-xr-x | tools/boost_names.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index e00897d..562a341 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -814,6 +814,7 @@ BOOST_LIBS = [ 'boost_math_c99f', 'boost_math_c99l', 'boost_mpi', + 'boost_program_options', 'boost_random', 'boost_regex', 'boost_serialization', diff --git a/tools/boost_names.py b/tools/boost_names.py index 9ac16bb..f9f1f11 100755 --- a/tools/boost_names.py +++ b/tools/boost_names.py @@ -99,6 +99,10 @@ def get_library_names(jamfile): for matches in res: if ':' in matches.group(2): libs.append(matches.group(1)) + res = re.finditer(r'^boost-lib[\s]+([A-Za-z0-9_]+)([^;]*);', jam, re.MULTILINE | re.DOTALL) + for matches in res: + if ':' in matches.group(2): + libs.append('boost_{}'.format(matches.group(1))) return libs def exists(modules, module): |