diff options
| author | Adam C. Foltzer <acfoltzer@galois.com> | 2017-05-25 11:20:29 -0700 |
|---|---|---|
| committer | Adam C. Foltzer <acfoltzer@galois.com> | 2017-05-25 11:20:29 -0700 |
| commit | 80fd7106e8ec0a74ace0919f3c412bb8f5e869f7 (patch) | |
| tree | 6e9d905752f249ad1782782c3f0bd2cb2ba369c3 | |
| parent | 07f117e38504df2525b4b09eb16ccc208031db9c (diff) | |
| download | meson-80fd7106e8ec0a74ace0919f3c412bb8f5e869f7.zip meson-80fd7106e8ec0a74ace0919f3c412bb8f5e869f7.tar.gz meson-80fd7106e8ec0a74ace0919f3c412bb8f5e869f7.tar.bz2 | |
add support for static flag on Windows Boost dependency
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 3e0b558..189e730 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2017 The Meson development team +# Copyright 2013-2017 The Meson development team # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -37,6 +37,7 @@ class BoostDependency(Dependency): self.name = 'boost' self.environment = environment self.libdir = '' + self.static = kwargs.get('static', False) if 'native' in kwargs and environment.is_cross_build(): self.want_cross = not kwargs['native'] else: @@ -194,7 +195,7 @@ class BoostDependency(Dependency): return libdir = libdir[0] self.libdir = libdir - globber = 'boost_*-gd-*.lib' # FIXME + globber = 'libboost_*-gd-*.lib' if self.static else 'boost_*-gd-*.lib' # FIXME for entry in glob.glob(os.path.join(libdir, globber)): (_, fname) = os.path.split(entry) base = fname.split('_', 1)[1] |