diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-07 21:04:25 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-07 21:04:25 +0300 |
| commit | 32f72fee2553ebc42daac5c9b70386629d47190f (patch) | |
| tree | 3c24772939c4979ee111be16edcbb95e849f053f | |
| parent | 776f899e78e88600f34176ef4088c32208802777 (diff) | |
| parent | 02897234abc3b606ee5ebc2e92be65da2d0902cf (diff) | |
| download | meson-32f72fee2553ebc42daac5c9b70386629d47190f.zip meson-32f72fee2553ebc42daac5c9b70386629d47190f.tar.gz meson-32f72fee2553ebc42daac5c9b70386629d47190f.tar.bz2 | |
Merge pull request #262 from germandiagogomez/boost-macosx-lib-detection
BoostDependency dylib detection added.
| -rw-r--r-- | authors.txt | 1 | ||||
| -rw-r--r-- | dependencies.py | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/authors.txt b/authors.txt index 0db0c3d..88e8ba3 100644 --- a/authors.txt +++ b/authors.txt @@ -20,3 +20,4 @@ Mathieu Duponchelle Jouni Roivas Rafaël Kooi Marko Raatikainen +German Diago Gomez diff --git a/dependencies.py b/dependencies.py index b3ca400..fc0f219 100644 --- a/dependencies.py +++ b/dependencies.py @@ -510,7 +510,13 @@ class BoostDependency(Dependency): self.lib_modules_mt[modname] = fname def detect_lib_modules_nix(self): - globber = 'libboost_*.so' # FIXME, make platform independent. + libsuffix = None + if mesonlib.is_osx(): + libsuffix = 'dylib' + else: + libsuffix = 'so' + + globber = 'libboost_*.{}'.format(libsuffix) if self.boost_root is None: libdirs = mesonlib.get_library_dirs() else: |