aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-11-17 22:40:30 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-11-17 22:40:30 +0200
commitb40ddb955c950e6d3256095e218413d98da343f5 (patch)
tree0033df3870db2b796eb3d26354cc7181950cb25b
parenta2b597d6028e9252c03552ae4bc9424a08f8a986 (diff)
downloadmeson-b40ddb955c950e6d3256095e218413d98da343f5.zip
meson-b40ddb955c950e6d3256095e218413d98da343f5.tar.gz
meson-b40ddb955c950e6d3256095e218413d98da343f5.tar.bz2
Return flags in the correct function.
-rw-r--r--dependencies.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/dependencies.py b/dependencies.py
index c7741be..5372df3 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -207,7 +207,10 @@ class BoostDependency(Dependency):
mlog.log("Dependency Boost (%s) found:" % module_str, mlog.red('NO'))
def get_compile_flags(self):
- return []
+ flags = []
+ if self.boost_root is not None:
+ flags.append('-I' + os.path.join(self.boost_root, 'include'))
+ return flags
def get_requested(self, kwargs):
modules = 'modules'
@@ -275,7 +278,6 @@ class BoostDependency(Dependency):
# FIXME, these are in gcc format, not msvc.
# On the other hand, so are the flags that
# pkg-config returns.
- flags.append('-I' + os.path.join(self.boost_root, 'include'))
flags.append('-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: