Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add support for static flag on Windows Boost dependency

This commit is contained in:
Adam C. Foltzer 2017-05-25 11:20:29 -07:00
parent 07f117e385
commit 80fd7106e8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mesonbuild/dependencies/misc.py
View File

@ -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"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with 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.name = 'boost'
self.environment = environment self.environment = environment
self.libdir = '' self.libdir = ''
self.static = kwargs.get('static', False)
if 'native' in kwargs and environment.is_cross_build(): if 'native' in kwargs and environment.is_cross_build():
self.want_cross = not kwargs['native'] self.want_cross = not kwargs['native']
else: else:
@ -194,7 +195,7 @@ class BoostDependency(Dependency):
return return
libdir = libdir[0] libdir = libdir[0]
self.libdir = libdir 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)): for entry in glob.glob(os.path.join(libdir, globber)):
(_, fname) = os.path.split(entry) (_, fname) = os.path.split(entry)
base = fname.split('_', 1)[1] base = fname.split('_', 1)[1]