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

Use get_default_include_dirs to detect BOOST_ROOT 

This removes the need to specify BOOST_ROOT for cross-compilers.
This commit is contained in:
Jan Niklas Hasse 2017-10-05 23:16:11 +02:00 committed by Jussi Pakkanen
parent a3e655d20d
commit 7b36897ff9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mesonbuild/dependencies/misc.py
View File

@ -82,9 +82,6 @@ class BoostDependency(ExternalDependency):
if 'BOOST_LIBRARYDIR' in os.environ: if 'BOOST_LIBRARYDIR' in os.environ:
self.libdir = os.environ['BOOST_LIBRARYDIR'] self.libdir = os.environ['BOOST_LIBRARYDIR']
if self.want_cross and self.boost_root is None and self.incdir is None:
raise DependencyException('BOOST_ROOT or BOOST_INCLUDEDIR is needed while cross-compiling')
if self.boost_root is None: if self.boost_root is None:
if mesonlib.is_windows(): if mesonlib.is_windows():
self.boost_roots = self.detect_win_roots() self.boost_roots = self.detect_win_roots()
@ -131,7 +128,8 @@ class BoostDependency(ExternalDependency):
mlog.log('Dependency Boost (%s) found:' % module_str, mlog.green('YES'), info) mlog.log('Dependency Boost (%s) found:' % module_str, mlog.green('YES'), info)
def detect_nix_roots(self): def detect_nix_roots(self):
return ['/usr/local', '/usr'] return [os.path.abspath(os.path.join(x, '..'))
for x in self.compiler.get_default_include_dirs()]
def detect_win_roots(self): def detect_win_roots(self):
res = [] res = []