boost: always use compiler include paths

pull/7132/head
Daniel Mensinger 5 years ago committed by Nirbheek Chauhan
parent a63e36f7b1
commit 8f1db99cec
  1. 8
      mesonbuild/dependencies/boost.py

@ -605,6 +605,12 @@ class BoostDependency(ExternalDependency):
roots += paths roots += paths
return roots # Do not add system paths if BOOST_ROOT is present return roots # Do not add system paths if BOOST_ROOT is present
# Add roots from system paths
inc_paths = [Path(x) for x in self.clib_compiler.get_default_include_dirs()]
inc_paths = [x.parent for x in inc_paths if x.exists()]
inc_paths = [x.resolve() for x in inc_paths]
roots += inc_paths
# Add system paths # Add system paths
if self.env.machines[self.for_machine].is_windows(): if self.env.machines[self.for_machine].is_windows():
# Where boost built from source actually installs it # Where boost built from source actually installs it
@ -626,8 +632,6 @@ class BoostDependency(ExternalDependency):
roots += [x for x in candidates if x.name.lower().startswith('boost') and x.is_dir()] roots += [x for x in candidates if x.name.lower().startswith('boost') and x.is_dir()]
else: else:
tmp = [] # type: T.List[Path] tmp = [] # type: T.List[Path]
# Add unix paths
tmp += [Path(x).parent for x in self.clib_compiler.get_default_include_dirs()]
# Homebrew # Homebrew
brew_boost = Path('/usr/local/Cellar/boost') brew_boost = Path('/usr/local/Cellar/boost')

Loading…
Cancel
Save