aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-11-17 22:33:11 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-11-17 22:33:11 +0200
commitfe78d89d7f1fc250f51157e2d9bdabc6b329bc4d (patch)
tree6b8aedd90e80a1a88ad050d804e5b6c057d50831
parenta6e31563f82882ff03d3c838b1856f60a8b05120 (diff)
downloadmeson-fe78d89d7f1fc250f51157e2d9bdabc6b329bc4d.zip
meson-fe78d89d7f1fc250f51157e2d9bdabc6b329bc4d.tar.gz
meson-fe78d89d7f1fc250f51157e2d9bdabc6b329bc4d.tar.bz2
Add include and link path flags when using a nonstandard Boost location.
-rw-r--r--dependencies.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/dependencies.py b/dependencies.py
index d68e0cc..605e623 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -270,7 +270,13 @@ class BoostDependency(Dependency):
self.lib_modules[name] = True
def get_link_flags(self):
- flags = [] # Fixme, add -L if necessary.
+ flags = []
+ if self.boost_root:
+ # FIXME, these are in gcc format, not msvc.
+ # On the other hand, so are the flags that
+ # pkg-config returns.
+ flags += '-I' + os.path.join(self.boost_root, 'include')
+ flags += '-L' + os.path.join(self.boost_root, 'lib')
for module in self.requested_modules:
if module in self.lib_modules or module in self.lib_modules_mt:
linkcmd = '-lboost_' + module