aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-05-14 17:48:27 +0200
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2020-05-14 18:49:37 +0000
commit8f1db99cec2e8c4eec0bb04698b3e0ce72f921e9 (patch)
tree5f1fd98519a0867a47ee3948e929440a9843a7ec
parenta63e36f7b114d66f455936fa6621b30a3a54675f (diff)
downloadmeson-8f1db99cec2e8c4eec0bb04698b3e0ce72f921e9.zip
meson-8f1db99cec2e8c4eec0bb04698b3e0ce72f921e9.tar.gz
meson-8f1db99cec2e8c4eec0bb04698b3e0ce72f921e9.tar.bz2
boost: always use compiler include paths
-rw-r--r--mesonbuild/dependencies/boost.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
index 2e84820..6e85c53 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -605,6 +605,12 @@ class BoostDependency(ExternalDependency):
roots += paths
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
if self.env.machines[self.for_machine].is_windows():
# 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()]
else:
tmp = [] # type: T.List[Path]
- # Add unix paths
- tmp += [Path(x).parent for x in self.clib_compiler.get_default_include_dirs()]
# Homebrew
brew_boost = Path('/usr/local/Cellar/boost')